From b22f1b0e9ef94015300b54d55f3a025cc82d1ec7 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 14:52:52 +0000 Subject: [PATCH 01/16] perl526: drop --- pkgs/development/interpreters/perl/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 909991e0348..4e1028184aa 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -173,11 +173,6 @@ let setupHook = ./setup-hook-cross.sh; }); in rec { - perl526 = common { - version = "5.26.3"; - sha256 = "14y46c1cnrfnd1k5nk6fj5w5vxna5xav6pmk44qaabr9x06y8nmp"; - }; - # the latest Maint version perl528 = common { version = "5.28.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5191f9683a3..7594d6c0f83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7815,7 +7815,7 @@ in ocropus = callPackage ../applications/misc/ocropus { }; - inherit (callPackages ../development/interpreters/perl {}) perl526 perl528 perldevel; + inherit (callPackages ../development/interpreters/perl {}) perl528 perldevel; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -13158,10 +13158,6 @@ in ### DEVELOPMENT / PERL MODULES - perl526Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { - perl = perl526; - overrides = (config.perlPackageOverrides or (p: {})) pkgs; - }); # the latest Maint version perl528Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { perl = perl528; From 5229e8be63ce66577da1aa088b5dcedc30bba611 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 14:54:26 +0000 Subject: [PATCH 02/16] perl-packages.nix: min version set to 5.28.1 (so the modules bundled with this version can be removed from nixpkgs) --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 74e9e60a0f8..9119878b55c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7,8 +7,8 @@ {config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}: -# cpan2nix assumes that perl-packages.nix will be used only with perl 5.26 or above -assert stdenv.lib.versionAtLeast perl.version "5.26"; +# cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.1 or above +assert stdenv.lib.versionAtLeast perl.version "5.28.1"; let inherit (stdenv.lib) maintainers; self = _self // overrides; From f4bff8b56d824ef89250aca4b386eab16f8c17c5 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 14:54:48 +0000 Subject: [PATCH 03/16] [cpan2nix] perlPackages.threads: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9119878b55c..4b5ce4f813e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16620,17 +16620,7 @@ let buildInputs = [ TestDifferences ]; }; - threads = buildPerlPackage rec { - name = "threads-2.21"; - src = fetchurl { - url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; - sha256 = "047i22mdnf7fa0h9w5jhqrjbg561l5jxk8xqzwh6zbmwlac4qf98"; - }; - meta = { - description = "Perl interpreter-based threads"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + threads = null; # part of Perl 5.28 threadsshared = buildPerlPackage rec { name = "threads-shared-1.58"; From 9b4c9e9c7bf07b36e33dfacbc0d41185c861a5c1 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 14:54:17 +0000 Subject: [PATCH 04/16] [cpan2nix] perlPackages.UnicodeCollate: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4b5ce4f813e..2dde8457dc1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17004,17 +17004,7 @@ let }; }; - UnicodeCollate = buildPerlPackage rec { - name = "Unicode-Collate-1.25"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SADAHIRO/${name}.tar.gz"; - sha256 = "1dpvck4saah8hqb9c82i25yimy9x2hkr1k3a2f1ly0k0ifhbiyyx"; - }; - meta = { - description = "Unicode Collation Algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + UnicodeCollate = null; # part of Perl 5.28 UnicodeLineBreak = buildPerlPackage rec { name = "Unicode-LineBreak-2018.003"; From a004f7e6702c31c991a3b4f2ce77556b6db162e4 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 14:54:13 +0000 Subject: [PATCH 05/16] [cpan2nix] perlPackages.TimeHiRes: removed built-in --- pkgs/top-level/perl-packages.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2dde8457dc1..ff8cd940e11 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16808,13 +16808,7 @@ let }; }; - TimeHiRes = buildPerlPackage rec { - name = "Time-HiRes-1.9758"; - src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHI/Time-HiRes-1.9758.tar.gz; - sha256 = "07jbydcdzpjm6i4nidci0rlklx4kla210fsl6zishw0yq5di9yjv"; - }; - }; + TimeHiRes = null; # part of Perl 5.28 TimeLocal = buildPerlPackage { name = "Time-Local-1.28"; From 6f4c9b145b79b8e2439a5cf2bcedf48bb2a1cafa Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 14:53:32 +0000 Subject: [PATCH 06/16] [cpan2nix] perlPackages.TestHarness: removed built-in --- pkgs/top-level/perl-packages.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ff8cd940e11..1a83bbeb123 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15182,19 +15182,7 @@ let }; }; - TestHarness = buildPerlPackage { - name = "Test-Harness-3.42"; - src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Test-Harness-3.42.tar.gz; - sha256 = "0fd90d4efea82d6e262e6933759e85d27cbcfa4091b14bf4042ae20bab528e53"; - }; - doCheck = false; # makes assumptions about path to Perl - meta = { - homepage = http://testanything.org/; - description = "Run Perl standard test scripts with statistics"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + TestHarness = null; # part of Perl 5.28 TestHarnessStraps = buildPerlModule { name = "Test-Harness-Straps-0.30"; From 2b6efa66cb03382f0b817f3d8f402e1c4064ba09 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 14:53:04 +0000 Subject: [PATCH 07/16] [cpan2nix] perlPackages.Socket: removed built-in --- pkgs/top-level/perl-packages.nix | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1a83bbeb123..4ee3cd81481 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13573,21 +13573,7 @@ let buildInputs = [ TestWarn XMLParserLite ]; }; - Socket = buildPerlPackage { - name = "Socket-2.027"; - src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Socket-2.027.tar.gz; - sha256 = "1a725fbqx6bjzjf63bgs5wvzd20kffz1f94pbmv1670p9m4i270l"; - }; - postPatch = '' - # requires network access - rm t/getnameinfo.t t/getaddrinfo.t - ''; - meta = { - description = "Networking constants and support functions"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + Socket = null; # part of Perl 5.28 Socket6 = buildPerlPackage rec { name = "Socket6-0.29"; From cacfef0891296cee08ca51932b31fd958df9e895 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 14:53:02 +0000 Subject: [PATCH 08/16] [cpan2nix] perlPackages.SelfLoader: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4ee3cd81481..25812554888 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13391,17 +13391,7 @@ let }; }; - SelfLoader = buildPerlPackage { - name = "SelfLoader-1.24"; - src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/SelfLoader-1.24.tar.gz; - sha256 = "4c7cd20fd82aa10520ac14b05fa003f60c72bb4c95527bd12aec8bf3c4546098"; - }; - meta = { - description = "Load functions only on demand"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + SelfLoader = null; # part of Perl 5.28 SerealDecoder = buildPerlPackage rec { name = "Sereal-Decoder-4.005"; From 2fe502905edac68c1c3fda41bea70527196498ac Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 14:51:10 +0000 Subject: [PATCH 09/16] [cpan2nix] perlPackages.IOSocketIP: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 25812554888..a37e94987d3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7716,17 +7716,7 @@ let }; }; - IOSocketIP = buildPerlModule { - name = "IO-Socket-IP-0.39"; - src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/IO-Socket-IP-0.39.tar.gz; - sha256 = "11950da7636cb786efd3bfb5891da4c820975276bce43175214391e5c32b7b96"; - }; - meta = { - description = "Family-neutral IP socket supporting both IPv4 and IPv6"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + IOSocketIP = null; # part of Perl 5.28 IOSocketInet6 = buildPerlModule rec { name = "IO-Socket-INET6-2.72"; From f2615b7474fe39f9e8a15a2c6dd2a3b32b45c568 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 14:50:46 +0000 Subject: [PATCH 10/16] [cpan2nix] perlPackages.FilterSimple: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a37e94987d3..dd3bfabe2da 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6198,17 +6198,7 @@ let }; }; - FilterSimple = buildPerlPackage { - name = "Filter-Simple-0.94"; - src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Filter-Simple-0.94.tar.gz; - sha256 = "1lkrgsqaxf595ha1y29gxqqf4kf8cpm5yzr4gg7zngbq1nb0pz6g"; - }; - meta = { - description = "Simplified source filtering"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + FilterSimple = null; # part of Perl 5.28 FinanceQuote = buildPerlPackage rec { name = "Finance-Quote-1.47"; From 1e5cee06d03adc3dca36ae1cefcb29f4da7f63cf Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 14:50:35 +0000 Subject: [PATCH 11/16] [cpan2nix] perlPackages.ExtUtilsParseXS: removed built-in --- pkgs/top-level/perl-packages.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dd3bfabe2da..0ba13775a37 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5466,13 +5466,7 @@ let }; }; - ExtUtilsParseXS = buildPerlPackage rec { - name = "ExtUtils-ParseXS-3.35"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/SM/SMUELLER/${name}.tar.gz"; - sha256 = "077fqiyabydm8j34wxzxwxskyidh8nmwq9gskaxai8kq298z1pj1"; - }; - }; + ExtUtilsParseXS = null; # part of Perl 5.28 ExtUtilsPkgConfig = buildPerlPackage rec { name = "ExtUtils-PkgConfig-1.16"; From 6f900b11698a7d1a5ea0dfa9a231408e6d10dcd2 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 14:50:28 +0000 Subject: [PATCH 12/16] [cpan2nix] perlPackages.ExtUtilsCBuilder: removed built-in --- pkgs/top-level/perl-packages.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0ba13775a37..b80c522b56e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5318,13 +5318,7 @@ let }; }; - ExtUtilsCBuilder = buildPerlPackage rec { - name = "ExtUtils-CBuilder-0.280230"; - src = fetchurl { - url = mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-CBuilder-0.280230.tar.gz; - sha256 = "1mcwvic01x0flcz3jsny5j8j5zz96r63qjwq75hs42cpf3by3ahx"; - }; - }; + ExtUtilsCBuilder = null; # part of Perl 5.28 ExtUtilsCChecker = buildPerlModule rec { name = "ExtUtils-CChecker-0.10"; From 6ddd5c1509ec46c0415c73d7113ae3d4a70cf625 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 14:49:30 +0000 Subject: [PATCH 13/16] [cpan2nix] perlPackages.Carp: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b80c522b56e..e063761da0e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1088,17 +1088,7 @@ let }; }; - Carp = buildPerlPackage rec { - name = "Carp-1.50"; - src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/Carp-1.50.tar.gz; - sha256 = "1ngbpjyd9qi7n4h5r3q3qibd8by7rfiv7364jqlv4lbd3973n9zm"; - }; - meta = with stdenv.lib; { - description = "Alternative warn and die for modules"; - license = with licenses; [ artistic1 gpl1Plus ]; - }; - }; + Carp = null; # part of Perl 5.28 CarpAlways = buildPerlPackage rec { name = "Carp-Always-0.16"; From 6a9a53347679b553f60a747f89a80a679a1f806e Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 15:08:27 +0000 Subject: [PATCH 14/16] perl-packages.nix: put removed modules under config.allowAliases --- pkgs/top-level/perl-packages.nix | 34 +++++++++++--------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e063761da0e..e0186af6745 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1088,8 +1088,6 @@ let }; }; - Carp = null; # part of Perl 5.28 - CarpAlways = buildPerlPackage rec { name = "Carp-Always-0.16"; src = fetchurl { @@ -5308,8 +5306,6 @@ let }; }; - ExtUtilsCBuilder = null; # part of Perl 5.28 - ExtUtilsCChecker = buildPerlModule rec { name = "ExtUtils-CChecker-0.10"; src = fetchurl { @@ -5450,8 +5446,6 @@ let }; }; - ExtUtilsParseXS = null; # part of Perl 5.28 - ExtUtilsPkgConfig = buildPerlPackage rec { name = "ExtUtils-PkgConfig-1.16"; src = fetchurl { @@ -6176,8 +6170,6 @@ let }; }; - FilterSimple = null; # part of Perl 5.28 - FinanceQuote = buildPerlPackage rec { name = "Finance-Quote-1.47"; src = fetchurl { @@ -7684,8 +7676,6 @@ let }; }; - IOSocketIP = null; # part of Perl 5.28 - IOSocketInet6 = buildPerlModule rec { name = "IO-Socket-INET6-2.72"; src = fetchurl { @@ -13349,8 +13339,6 @@ let }; }; - SelfLoader = null; # part of Perl 5.28 - SerealDecoder = buildPerlPackage rec { name = "Sereal-Decoder-4.005"; src = fetchurl { @@ -13521,8 +13509,6 @@ let buildInputs = [ TestWarn XMLParserLite ]; }; - Socket = null; # part of Perl 5.28 - Socket6 = buildPerlPackage rec { name = "Socket6-0.29"; src = fetchurl { @@ -15116,8 +15102,6 @@ let }; }; - TestHarness = null; # part of Perl 5.28 - TestHarnessStraps = buildPerlModule { name = "Test-Harness-Straps-0.30"; src = fetchurl { @@ -16542,8 +16526,6 @@ let buildInputs = [ TestDifferences ]; }; - threads = null; # part of Perl 5.28 - threadsshared = buildPerlPackage rec { name = "threads-shared-1.58"; src = fetchurl { @@ -16730,8 +16712,6 @@ let }; }; - TimeHiRes = null; # part of Perl 5.28 - TimeLocal = buildPerlPackage { name = "Time-Local-1.28"; src = fetchurl { @@ -16920,8 +16900,6 @@ let }; }; - UnicodeCollate = null; # part of Perl 5.28 - UnicodeLineBreak = buildPerlPackage rec { name = "Unicode-LineBreak-2018.003"; src = fetchurl { @@ -17807,6 +17785,18 @@ let UnicodeNormalize = null; # part of Perl 5.26 XSLoader = null; # part of Perl 5.26 + Carp = null; # part of Perl 5.28 + ExtUtilsCBuilder = null; # part of Perl 5.28 + ExtUtilsParseXS = null; # part of Perl 5.28 + FilterSimple = null; # part of Perl 5.28 + IOSocketIP = null; # part of Perl 5.28 + SelfLoader = null; # part of Perl 5.28 + Socket = null; # part of Perl 5.28 + TestHarness = null; # part of Perl 5.28 + threads = null; # part of Perl 5.28 + TimeHiRes = null; # part of Perl 5.28 + UnicodeCollate = null; # part of Perl 5.28 + ArchiveZip_1_53 = self.ArchiveZip; Autobox = self.autobox; CommonSense = self.commonsense; # For backwards compatibility. From 707c059eb233b61e0cb9371e81236690ac89bb7d Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 15:31:46 +0000 Subject: [PATCH 15/16] znapzend: fix eval --- pkgs/tools/backup/znapzend/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index bc57215c0c4..e9218fd403e 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/znapzend --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${perlPackages.TestHarness}/${perl.libPrefix} \ -I${Mojolicious-6-46}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ @@ -60,7 +59,6 @@ stdenv.mkDerivation rec { " substituteInPlace $out/bin/znapzendzetup --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${perlPackages.TestHarness}/${perl.libPrefix} \ -I${Mojolicious-6-46}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ @@ -68,7 +66,6 @@ stdenv.mkDerivation rec { " substituteInPlace $out/bin/znapzendztatz --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${perlPackages.TestHarness}/${perl.libPrefix} \ -I${Mojolicious-6-46}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ From 6d2edfb0b86927319de59dcd6c98f9a66cd57f65 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 14 Dec 2018 15:40:36 +0000 Subject: [PATCH 16/16] treewide: remove aliases evaluated to `null` --- .../scripts/nix-generate-from-cpan.nix | 2 +- pkgs/applications/graphics/feh/default.nix | 2 +- pkgs/applications/misc/slic3r/default.nix | 6 ++-- pkgs/applications/misc/slic3r/prusa3d.nix | 1 - .../networking/sieve-connect/default.nix | 2 +- pkgs/servers/foswiki/default.nix | 4 +-- pkgs/servers/monitoring/munin/default.nix | 3 +- pkgs/servers/openxpki/default.nix | 36 +++++++++---------- pkgs/tools/backup/znapzend/default.nix | 2 +- pkgs/tools/security/john/default.nix | 2 +- pkgs/tools/security/signing-party/default.nix | 2 +- pkgs/tools/text/popfile/default.nix | 1 - pkgs/tools/text/schema2ldif/default.nix | 2 +- pkgs/tools/typesetting/biber/default.nix | 4 +-- pkgs/top-level/perl-packages.nix | 2 +- 15 files changed, 34 insertions(+), 37 deletions(-) diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index ec406ac1a70..5c4cf0f6c55 100644 --- a/maintainers/scripts/nix-generate-from-cpan.nix +++ b/maintainers/scripts/nix-generate-from-cpan.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "nix-generate-from-cpan-3"; buildInputs = with perlPackages; [ - makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly LogLog4perl + makeWrapper perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl ]; phases = [ "installPhase" ]; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 8938df4d42d..ff59a7fe6ee 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { install -D -m 644 man/*.1 $out/share/man/man1 ''; - checkInputs = [ perlPackages.TestCommand perlPackages.TestHarness ]; + checkInputs = [ perlPackages.TestCommand ]; preCheck = '' export PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" ''; diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 7b28462d552..e012c3763b3 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1pg4jxzb7f58ls5s8mygza8kqdap2c50kwlsdkf28bz1xi611zbi"; }; - buildInputs = - [boost] ++ + buildInputs = + [boost] ++ (with perlPackages; [ perl makeWrapper which - EncodeLocale MathClipper ExtUtilsXSpp threads + EncodeLocale MathClipper ExtUtilsXSpp MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX ExtUtilsMakeMaker OpenGL WxGLCanvas ModuleBuild LWP diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 251ee4d918b..680703737c2 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -74,7 +74,6 @@ stdenv.mkDerivation rec { Moo NetDBus OpenGL - threads XMLSAX ]); diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix index 78910d1ecf6..472a26274f8 100644 --- a/pkgs/applications/networking/sieve-connect/default.nix +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -29,7 +29,7 @@ wrapProgram $out/bin/sieve-connect \ --prefix PERL5LIB : "${stdenv.lib.makePerlPath (with perlPackages; [ - AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS PodUsage + AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS TermReadKey TermReadLineGnu ])}" ''; diff --git a/pkgs/servers/foswiki/default.nix b/pkgs/servers/foswiki/default.nix index 542322d0e62..572d1736755 100644 --- a/pkgs/servers/foswiki/default.nix +++ b/pkgs/servers/foswiki/default.nix @@ -15,8 +15,8 @@ perlPackages.buildPerlPackage rec { # minimum requirements from INSTALL.html#System_Requirements AlgorithmDiff ArchiveTar AuthenSASL CGI CGISession CryptPasswdMD5 EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree - IOSocketIP IOSocketSSL JSON - LocaleMaketext LocaleMaketextLexicon LocaleMsgfmt + IOSocketSSL JSON + LocaleMaketextLexicon LocaleMsgfmt LWP URI perlPackages.version /*# optional dependencies libapreq2 DBI DBDmysql DBDPg DBDSQLite FCGI FCGIProcManager diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 72d5f124c63..1f3ad21d0e0 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { perlPackages.NetSNMP perlPackages.NetServer perlPackages.ListMoreUtils - perlPackages.TimeHiRes perlPackages.LWP perlPackages.DBDPg python @@ -121,7 +120,7 @@ stdenv.mkDerivation rec { --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [ LogLog4perl IOSocketInet6 Socket6 URI DBFile DateManip HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer - ListMoreUtils TimeHiRes DBDPg LWP rrdtool + ListMoreUtils DBDPg LWP rrdtool ]}" done ''; diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 2b1000d0d85..192951607bf 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -20,34 +20,34 @@ perlPackages.buildPerlPackage { IPCShareLite JSON LogLog4perl LWPProtocolConnect LWPProtocolHttps MailRFC822Address Moose NetAddrIP NetDNS NetIP perlldap NetHTTP NetServer NetSSLeay ParamsValidate PathClass ProcProcessTable ProcSafeExec RegexpCommon SOAPLite Switch SysSigAction TemplateToolkit - TestPod TestPodCoverage TextCSV_XS TimeHiRes Workflow XMLFilterXInclude XMLParser + TestPod TestPodCoverage TextCSV_XS Workflow XMLFilterXInclude XMLParser XMLSAX XMLSAXWriter XMLSimple XMLValidatorSchema ] ++ stdenv.lib.optionals extraDependencies1 [ # dependencies from parsing through core/server - ClassAccessor Carp PathTools DataDumper DateTime DateTimeFormatStrptime DBI DigestMD5 - Encode ExceptionClass Exporter FilePath FileTemp Filter GetoptLong HTMLParser - ScalarListUtils MathBigInt Memoize libnet PodUsage RTClientREST Socket - Storable XSLoader ] + ClassAccessor PathTools DataDumper DateTime DateTimeFormatStrptime DBI + Encode ExceptionClass FilePath FileTemp Filter GetoptLong HTMLParser + ScalarListUtils MathBigInt Memoize libnet RTClientREST + Storable ] ++ stdenv.lib.optionals extraDependencies2 [ # dependencies taken from Debian - MooseXTypesPathClass DataStreamBulk MooseXStrictConstructor NamespaceAutoclean GitPurePerl + MooseXTypesPathClass DataStreamBulk MooseXStrictConstructor GitPurePerl ConfigGitLike DevelStackTrace TreeDAGNode ClassObservable ClassFactory TimeDate ConfigAny CGIFast ClassISA YAML YAMLLibYAML AuthenSASL TextCSV FileFindRulePerl IODigest ] ++ stdenv.lib.optionals extraDependencies3 [ # dependencies taken from https://metacpan.org/pod/release/ALECH/Bundle-OpenXPKI-0.06/lib/Bundle/OpenXPKI.pm - AttributeHandlers AttributeParamsValidate AutoLoader BC CGI CPAN CacheCache ClassClassgenclassgen + AttributeParamsValidate BC CGI CPAN CacheCache ClassClassgenclassgen ClassContainer ClassDataInheritable ClassSingleton ConvertASN1 DBDSQLite DBIxHTMLViewLATEST - DBFile DataPage DataSpreadPagination DateTimeLocale DateTimeTimeZone DevelPPPort DevelSelfStubber - DevelSymdump DigestSHA1 Env Error ExtUtilsCommand ExtUtilsConstant ExtUtilsInstall - ExtUtilsMakeMaker FileCheckTree FilterSimple GoferTransporthttp HTMLMason HTMLTagset - HTTPServerSimpleMason I18NCollate IO IPCSysV LocaleCodes LocaleMaketext LogDispatch MathBigRat - MathComplex MathRound ModuleBuild ModuleBuildDeprecated NetPing PerlIOviaQuotedPrint PodChecker - PodCoverage PodEscapes PodLaTeX PodParser PodPerldoc PodPlainer PodSimple Safe SearchDict SelfLoader - SubUplevel SysSyslog TemplatePluginAutoformat TermANSIColor TermCap TermReadKey Test TestException - TestHTTPServerSimple TestHarness TestHarnessStraps TextAbbrev TextBalanced TextIconv TextSoundex - TextTabsWrap ThreadQueue ThreadSemaphore TieFile TieRefHash TimeLocal URI UnicodeCollate - UnicodeNormalize WWWMechanize Want XMLFilterBufferText XMLNamespaceSupport autodie base bignum if_ - lib libapreq2 libnet podlators threads threadsshared version ]; + DBFile DataPage DataSpreadPagination DateTimeLocale DateTimeTimeZone DevelPPPort + DevelSymdump DigestSHA1 Env Error ExtUtilsConstant ExtUtilsInstall + ExtUtilsMakeMaker FileCheckTree GoferTransporthttp HTMLMason HTMLTagset + HTTPServerSimpleMason IO IPCSysV LocaleCodes LogDispatch MathBigRat + MathRound ModuleBuild ModuleBuildDeprecated NetPing PodChecker + PodCoverage PodLaTeX PodParser PodPerldoc PodPlainer PodSimple + SubUplevel SysSyslog TemplatePluginAutoformat TermReadKey TestException + TestHTTPServerSimple TestHarnessStraps TextBalanced TextIconv TextSoundex + ThreadQueue TieFile TieRefHash TimeLocal URI + UnicodeNormalize WWWMechanize Want XMLFilterBufferText XMLNamespaceSupport bignum + libapreq2 libnet podlators threadsshared version ]; preConfigure = '' substituteInPlace core/server/Makefile.PL \ diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index e9218fd403e..5314eef9eb6 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sha256 = checksum; }; - buildInputs = [ wget perl perlPackages.TestHarness MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ]; + buildInputs = [ wget perl MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ]; nativeBuildInputs = [ autoconf automake ]; diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index cb545570f51..97f6ec21b54 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc pythonPackages.wrapPython perl makeWrapper ]; propagatedBuildInputs = (with pythonPackages; [ dpkt scapy lxml ]) ++ # For pcap2john.py - (with perlPackages; [ DigestMD4 DigestMD5 DigestSHA1 GetoptLong # For pass_gen.pl + (with perlPackages; [ DigestMD4 DigestSHA1 GetoptLong # For pass_gen.pl perlldap ]); # For sha-dump.pl # TODO: Get dependencies for radius2john.pl and lion2john-alt.pl diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index 14848df3f3a..2fe7b3e3cef 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -10,7 +10,7 @@ let GnuPGInterfaceRuntimeDependencies = with perlPackages; [ strictures ClassMethodModifiers DataPerl DevelGlobalDestruction ExporterTiny GnuPGInterface ListMoreUtils ModuleRuntime Moo MooXHandlesVia MooXlate - RoleTiny SubExporterProgressive SubQuote TypeTiny XSLoader + RoleTiny SubExporterProgressive SubQuote TypeTiny ]; in stdenv.mkDerivation rec { pname = "signing-party"; diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index dbc16cf7a45..5e76e354173 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { perl DBI DBDSQLite - DigestMD5 HTMLTagset TimeDate # == DateParse HTMLTemplate diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix index 699d2d28b82..b40ceadf978 100644 --- a/pkgs/tools/text/schema2ldif/default.nix +++ b/pkgs/tools/text/schema2ldif/default.nix @@ -18,7 +18,7 @@ gzip -c man/ldap-schema-manager.1 > $out/share/man/man1/ldap-schema-manager.1.gz wrapProgram $out/bin/schema2ldif \ - --prefix PERL5PATH : "${stdenv.lib.makePerlPath [ perlPackages.GetoptLong perlPackages.PodUsage ]}" + --prefix PERL5PATH : "${stdenv.lib.makePerlPath [ perlPackages.GetoptLong ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index ea9b68f02b9..123147cb5f1 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -20,8 +20,8 @@ perlPackages.buildPerlModule rec { DateTime DateTimeFormatBuilder DateTimeCalendarJulian ExtUtilsLibBuilder FileSlurper FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX - UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter - ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey + UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter + ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit SortKey TestDifferences ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e0186af6745..5c006597fa9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12049,7 +12049,7 @@ let sha256 = "0xk4h4dzl80kf97lbx0nznx9ajrb6kkg7k3iwca3rj6f3rqggv9y"; }; outputs = [ "out" ]; - buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey TimeHiRes ]; + buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey ]; meta = { description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; homepage = http://www.percona.com/software/percona-toolkit;