From d26b629b4c4c6251dd12524a01883b70011f2f0a Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 4 Jun 2018 11:25:38 +0000 Subject: [PATCH 1/2] znapzend: fix build fix build by pinning old versions of Perl Libraries --- pkgs/tools/backup/znapzend/default.nix | 34 ++++++++++++++++++-------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index 796a34c253a9..7cef9971d765 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,6 +1,22 @@ -{ stdenv, fetchFromGitHub, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }: +{ stdenv, fetchFromGitHub, fetchurl, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }: let + Mojolicious-6-46 = perlPackages.buildPerlPackage rec { + name = "Mojolicious-6.46"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; + sha256 = "0i3axmx4506fx5gms148pj65x6ys7flaz1aqjd8hd9zfkd8pzdfr"; + }; + }; + MojoIOLoopForkCall-0-17 = perlPackages.buildPerlModule rec { + name = "Mojo-IOLoop-ForkCall-0.17"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz"; + sha256 = "090qxz1nbah2qxvfg4whl6yp6q03qkx7a42751iai521nk1yavc8"; + }; + propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-6-46 ]; + }; + version = "0.18.0"; checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd"; in @@ -14,9 +30,7 @@ stdenv.mkDerivation rec { sha256 = checksum; }; - buildInputs = [ perl perlPackages.TestHarness perlPackages.Mojolicious - perlPackages.TAPParserSourceHandlerpgTAP perlPackages.MojoIOLoopForkCall - perlPackages.IOPipely wget ]; + buildInputs = [ wget perl perlPackages.TestHarness MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ]; nativeBuildInputs = [ autoconf automake ]; @@ -38,25 +52,25 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/znapzend --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ -I${perlPackages.TestHarness}/${perl.libPrefix} \ - -I${perlPackages.Mojolicious}/${perl.libPrefix} \ + -I${Mojolicious-6-46}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " substituteInPlace $out/bin/znapzendzetup --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ -I${perlPackages.TestHarness}/${perl.libPrefix} \ - -I${perlPackages.Mojolicious}/${perl.libPrefix} \ + -I${Mojolicious-6-46}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " substituteInPlace $out/bin/znapzendztatz --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ -I${perlPackages.TestHarness}/${perl.libPrefix} \ - -I${perlPackages.Mojolicious}/${perl.libPrefix} \ + -I${Mojolicious-6-46}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " ''; From 27b71b6e762f82600a22c6247e4a22a4a325ad17 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 4 Jun 2018 15:33:32 +0000 Subject: [PATCH 2/2] znapzend: minor comment --- pkgs/tools/backup/znapzend/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index 7cef9971d765..f78c300afd0a 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }: let + # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES Mojolicious-6-46 = perlPackages.buildPerlPackage rec { name = "Mojolicious-6.46"; src = fetchurl {