From b4323269f57ba5b92d478b72bf7776115ba1437f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 25 Sep 2018 07:40:30 -0500 Subject: [PATCH 01/59] cairo: 1.15.12 -> 1.15.14 --- pkgs/development/libraries/cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index db46412ceb5..7c0664533b8 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -10,14 +10,14 @@ assert glSupport -> libGL != null; let - version = "1.15.12"; + version = "1.15.14"; inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { name = "cairo-${version}"; src = fetchurl { url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; - sha256 = "1jcl0mnqq6j2xip8p506g2cj54sfycm339rrd3p4g2jljhdhh8vn"; + sha256 = "1399jfdpdhn4hf812hxlj1gyi3bznxwzhp2rnyq1nxjs05n6nmhn"; }; outputs = [ "out" "dev" "devdoc" ]; From 7047d60ef4a8aa0484ab6f59c594bfacfc054368 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 25 Sep 2018 20:03:46 -0500 Subject: [PATCH 02/59] libXinerama: 1.1.3 -> 1.1.4 https://lists.x.org/archives/xorg-announce/2018-July/002905.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 06dd540a481..c33997b72c8 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -908,11 +908,11 @@ let }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;}; libXinerama = (mkDerivation "libXinerama" { - name = "libXinerama-1.1.3"; + name = "libXinerama-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2; - sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs"; + url = mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2; + sha256 = "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xineramaproto ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index ca77e640814..846fa56de30 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -73,7 +73,7 @@ mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2 -mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2 From 115bc86e6c48f83d718ad03c2ad1380c6da4ed00 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 6 Aug 2018 19:18:02 -0400 Subject: [PATCH 03/59] paxctl: Fix cross and Darwin builds --- pkgs/os-specific/linux/paxctl/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix index 270be695f03..8fdd2356c30 100644 --- a/pkgs/os-specific/linux/paxctl/default.nix +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, elf-header }: stdenv.mkDerivation rec { name = "paxctl-${version}"; @@ -9,8 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53"; }; + buildInputs = [ elf-header ]; + preBuild = '' - sed "s|--owner 0 --group 0||g" -i Makefile + sed -i Makefile \ + -e 's|--owner 0 --group 0||g' \ + -e '/CC:=gcc/d' ''; makeFlags = [ @@ -24,7 +28,7 @@ stdenv.mkDerivation rec { description = "A tool for controlling PaX flags on a per binary basis"; homepage = "https://pax.grsecurity.net"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice ]; }; } From 361521f5b0062d396dabe72b3f0ca0cdd31b8bf9 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 26 Sep 2018 11:26:27 -0400 Subject: [PATCH 04/59] Revert "stdenv: partial revert of f2bb59e" This reverts commit 607063f61be3b19a2da054776b360d9c5b03038a. --- pkgs/stdenv/cross/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index d1efa360237..daa9f66615c 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -53,6 +53,9 @@ in lib.init bootStages ++ [ else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs + ++ lib.optionals + (hostPlatform.isLinux && !buildPlatform.isLinux) + [ buildPackages.patchelf buildPackages.paxctl ] ++ lib.optional (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform)) buildPackages.updateAutotoolsGnuConfigScriptsHook From 91c304030a509c1913d6baf5d274e2d078d10bfd Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 27 Sep 2018 11:54:40 -0400 Subject: [PATCH 05/59] texlive: generate MkIV caches Documentation: http://www.pragma-ade.com/general/manuals/tools-mkiv.pdf Fixes: #19279 Closes: #47370 --- pkgs/tools/typesetting/tex/texlive/combine.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 8a01ac74414..f76b71ced3c 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -235,6 +235,19 @@ in buildEnv { ln -s -t . ../texmf/doc/"$d"/* ) done + '' + + # MkIV uses its own lookup mechanism and we need to initialize + # caches for it. Unsetting TEXMFCNF is needed to let mtxrun + # determine it from kpathsea so that the config path is given with + # "selfautodir:" as it will be in runtime. This is important because + # the cache is identified by a hash of this path. + '' + if [[ -e "$out/bin/mtxrun" ]]; then + ( + unset TEXMFCNF + mtxrun --generate + ) + fi '' + bin.cleanBrokenLinks ; From 977a05cc3bc3c699f3c8ade0054a9d39fcbafa0a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 27 Sep 2018 12:03:16 -0700 Subject: [PATCH 06/59] p11-kit: 0.23.13 -> 0.23.14 (#46220) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from p11-kit --- pkgs/development/libraries/p11-kit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index e0e0b59a9a9..b4bdd200211 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "p11-kit-${version}"; - version = "0.23.13"; + version = "0.23.14"; src = fetchFromGitHub { owner = "p11-glue"; repo = "p11-kit"; rev = version; - sha256 = "1z2rbw2qbwj64i88llc1mkf0263qa0kxc2350kg25r7mghxbw1y6"; + sha256 = "0zmrw1ciybhnxjlsfb07wnf11ak5vrmy8y8fnz3mwm8v3w8dzlvw"; }; outputs = [ "out" "dev"]; From d47f73242853cfcc41db84344ab36e7fbdd24756 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 27 Sep 2018 12:05:13 -0700 Subject: [PATCH 07/59] bison: 3.0.5 -> 3.1 (#45843) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from bison --- pkgs/development/tools/parsing/bison/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 469e64acff0..d75a7e0ee3d 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { - name = "bison-3.0.5"; + name = "bison-3.1"; src = fetchurl { url = "mirror://gnu/bison/${name}.tar.gz"; - sha256 = "0rnml9spd6p0i5qy9g4r82drwdr09r1z9cf4p89agbrkxqmrsffd"; + sha256 = "0ip9krjf0lw57pk3wfbxgjhif1i18hm3vh35d1ifrvhnafskdjx7"; }; patches = []; # remove on another rebuild From f66ae2c8b20fd00853246cfd0a32fea0a7e06814 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 28 Sep 2018 03:15:59 -0500 Subject: [PATCH 08/59] libxcb: 1.13 -> 1.13.1 (#47450) https://lists.freedesktop.org/archives/xcb/2018-September/011155.html (cherry picked from commit b043a056a2cc6a4ab129ab1ce2bf7d4aa7d2ea69) --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/extra.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c33997b72c8..b06f41226ed 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1136,11 +1136,11 @@ let }) // {inherit ;}; libxcb = (mkDerivation "libxcb" { - name = "libxcb-1.13"; + name = "libxcb-1.13.1"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2; - sha256 = "1ahxhmdqp4bhb90zmc275rmf5wixqra4bnw9pqnzyl1w3598g30q"; + url = http://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2; + sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 222a9f65426..3c45e6062e2 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,5 +1,5 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2 +http://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 From 830f9fabd4a564bfbc3fbfc33a62b02010c0a7a5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 27 Sep 2018 17:40:16 -0500 Subject: [PATCH 09/59] patch-shebangs: use isScript to safely check for shebang start Fixes commonly encountered errors about broken pipes or null-bytes in command-substitution. --- pkgs/build-support/setup-hooks/patch-shebangs.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index d5586fccae6..0ac81102658 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -19,9 +19,8 @@ patchShebangs() { local newInterpreterLine find "$dir" -type f -perm -0100 | while read f; do - if [ "$(head -1 "$f" | head -c+2)" != '#!' ]; then - # missing shebang => not a script - continue + if ! isScript "$f"; then + continue fi oldInterpreterLine=$(head -1 "$f" | tail -c+3) From 286381f0727a5aee3413c24989ad5fb609653c49 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 28 Sep 2018 11:17:33 -0500 Subject: [PATCH 10/59] patch-shebangs: simplify a bit per reviewer suggestion --- pkgs/build-support/setup-hooks/patch-shebangs.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 0ac81102658..18eb011b0c7 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -19,9 +19,7 @@ patchShebangs() { local newInterpreterLine find "$dir" -type f -perm -0100 | while read f; do - if ! isScript "$f"; then - continue - fi + isScript "$f" || continue oldInterpreterLine=$(head -1 "$f" | tail -c+3) read -r oldPath arg0 args <<< "$oldInterpreterLine" From f7db287960241736213c0f262ad655ce40cfc624 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 28 Sep 2018 11:21:51 -0500 Subject: [PATCH 11/59] patch-shebangs.sh: use more robust 'for each file' loop, check for dir The latter is to avoid warnings printed by find if it doesn't exist. --- pkgs/build-support/setup-hooks/patch-shebangs.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 18eb011b0c7..d26bf735d30 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -18,7 +18,10 @@ patchShebangs() { local oldInterpreterLine local newInterpreterLine - find "$dir" -type f -perm -0100 | while read f; do + [ -e "$dir" ] || return 0 + + local f + while IFS= read -r -d $'\0' f; do isScript "$f" || continue oldInterpreterLine=$(head -1 "$f" | tail -c+3) @@ -58,7 +61,7 @@ patchShebangs() { rm "$f.timestamp" fi fi - done + done < <(find "$dir" -type f -perm -0100 -print0) stopNest } From da4813072f3cab88cff1ee71be9f877c3ed774a8 Mon Sep 17 00:00:00 2001 From: Milan Svoboda Date: Sat, 29 Sep 2018 23:10:23 +0200 Subject: [PATCH 12/59] boost: fix fiber header (#47540) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit include/boost/fiber/detail/context_spmc_queue.hpp:1:1: error: stray ‘\357’ in program caused by a leftover UTF-8 Byte Order Mark --- pkgs/development/libraries/boost/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 4131e5f7a27..1ab0718e796 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation { postFixup = '' # Make boost header paths relative so that they are not runtime dependencies cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ - -exec sed '1i#line 1 "{}"' -i '{}' \; + -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \; '' + optionalString (stdenv.hostPlatform.libc == "msvcrt") '' $RANLIB "$out/lib/"*.a ''; From 55b6cad5376186affaebc2d990515ad5f1cef1c1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 1 Oct 2018 17:14:26 -0500 Subject: [PATCH 13/59] lz4: 1.8.2 -> 1.8.3 (#47547) --- pkgs/tools/compression/lz4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 7e29ee2b856..1cd4c30a388 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "lz4-${version}"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { - sha256 = "0xbjbjrvgzypk8dnldakir06gb8m946d064lxx0qc4ky6m8n9hn2"; + sha256 = "0lq00yi7alr9aip6dw0flykzi8yv7z43aay177n86spn9qms7s3g"; rev = "v${version}"; repo = "lz4"; owner = "lz4"; From 8621415289becc0ef8ab4aee2e4d07894702007d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:12:31 +0000 Subject: [PATCH 14/59] [cpan2nix] perlPackages.ArchiveExtract: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 18ca62c02b0..2d449073132 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -493,7 +493,6 @@ let url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; sha256 = "25cbc2d5626c14d39a0b5e4fe8383941e085c9a7e0aa873d86e81b6e709025f4"; }; - propagatedBuildInputs = [ ModuleLoadConditional ]; meta = { description = "Generic archive extracting mechanism"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From b139a94587ae589dd4d92517a9e82daf252a014f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:12:31 +0000 Subject: [PATCH 15/59] [cpan2nix] perlPackages.AttributeHandlers: 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 2d449073132..18fc6007314 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -407,17 +407,7 @@ let }; }; - AttributeHandlers = buildPerlPackage { - name = "Attribute-Handlers-0.99"; - src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Attribute-Handlers-0.99.tar.gz; - sha256 = "937ea3ebfc9b14f4a4148bf3c32803709edbd12a387137a26370b38ee1fc9835"; - }; - meta = { - description = "Simpler definition of attribute handlers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + AttributeHandlers = null; # part of Perl 5.26 AttributeParamsValidate = buildPerlPackage { name = "Attribute-Params-Validate-1.21"; From 002a2a8d399902acff6ea1d362ec374006858db8 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:12:34 +0000 Subject: [PATCH 16/59] [cpan2nix] perlPackages.CPANMeta: removed built-in --- pkgs/top-level/perl-packages.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 18fc6007314..bdb5ea9f228 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2795,18 +2795,7 @@ let }; }; - CPANMeta = buildPerlPackage rec { - name = "CPAN-Meta-2.150010"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "1mm3dfw3ffyzb2ikpqn9l6zyqrxijb4vyywmbx2l21ryqwp0zy74"; - }; - meta = { - homepage = https://github.com/Perl-Toolchain-Gang/CPAN-Meta; - description = "The distribution metadata for a CPAN dist"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + CPANMeta = null; # part of Perl 5.26 CPANMetaCheck = buildPerlPackage rec { name = "CPAN-Meta-Check-0.014"; From 34d42976681beca8c855abb7407296291da4397d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:12:35 +0000 Subject: [PATCH 17/59] [cpan2nix] perlPackages.CPANMetaRequirements: removed built-in --- pkgs/top-level/perl-packages.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bdb5ea9f228..789e3543f54 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2810,18 +2810,7 @@ let }; }; - CPANMetaRequirements = buildPerlPackage { - name = "CPAN-Meta-Requirements-2.140"; - src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.140.tar.gz; - sha256 = "0898645e8e86f0922f0f0502b503f592a8eb3d3176b4fd87adcc7ba51e751fa9"; - }; - meta = { - homepage = https://github.com/dagolden/CPAN-Meta-Requirements; - description = "A set of version requirements for a CPAN dist"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + CPANMetaRequirements = null; # part of Perl 5.26 CPANMetaYAML = buildPerlPackage rec { name = "CPAN-Meta-YAML-0.018"; From 877253bb2485c7dfd03b2a4107faafc95fe9cdbe Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:12:35 +0000 Subject: [PATCH 18/59] [cpan2nix] perlPackages.CPANMetaYAML: 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 789e3543f54..05e1395f9b4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2812,19 +2812,7 @@ let CPANMetaRequirements = null; # part of Perl 5.26 - CPANMetaYAML = buildPerlPackage rec { - name = "CPAN-Meta-YAML-0.018"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "150jh9l7baddl2587m23qs2l0pb395qsx9bhsgdsnn6y9k4zgjik"; - }; - doCheck = true; - meta = { - homepage = https://github.com/dagolden/CPAN-Meta-YAML; - description = "Read and write a subset of YAML for CPAN Meta files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + CPANMetaYAML = null; # part of Perl 5.26 CPANPerlReleases = buildPerlPackage rec { name = "CPAN-Perl-Releases-3.74"; From 5342617b49072971cedd554975636086dcb54d7e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:12:35 +0000 Subject: [PATCH 19/59] [cpan2nix] perlPackages.CPANPerlReleases: 3.74 -> 3.76 --- 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 05e1395f9b4..d9c2d776ed1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2815,10 +2815,10 @@ let CPANMetaYAML = null; # part of Perl 5.26 CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-3.74"; + name = "CPAN-Perl-Releases-3.76"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "0qdh79fl38cyq9kp2g2s934gl1nn5jd88rgmqarqcmja8xhpfcp3"; + sha256 = "0p9anb92sfi6cfr3ia8yvd3scn0bzwh2r6z8f6jrawjr8lilgahj"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; From 53fb0d493d892098f1acdbea48a5b35de20a4ebf Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:00 +0000 Subject: [PATCH 20/59] [cpan2nix] perlPackages.DigestMD5: 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 d9c2d776ed1..59bcedd37e6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4444,17 +4444,7 @@ let }; }; - DigestMD5 = buildPerlPackage { - name = "Digest-MD5-2.55"; - src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Digest-MD5-2.55.tar.gz; - sha256 = "03b198a2d14425d951e5e50a885d3818c3162c8fe4c21e18d7798a9a179d0e3c"; - }; - meta = { - description = "Perl interface to the MD-5 algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + DigestMD5 = null; # part of Perl 5.26 DigestMD5File = buildPerlPackage { name = "Digest-MD5-File-0.08"; From 44599c23a4321caae981fa49500cddbdf2cd7e91 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:02 +0000 Subject: [PATCH 21/59] [cpan2nix] perlPackages.EmailMIMEContentType: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 59bcedd37e6..97eb4e5cb74 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4963,7 +4963,6 @@ let description = "Parse a MIME Content-Type Header"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [ Encode ]; }; EmailMIMEEncodings = buildPerlPackage rec { From cc3e2fc39132729b050b1523399317190d778ae8 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:40 +0000 Subject: [PATCH 22/59] [cpan2nix] perlPackages.ListMoreUtilsXS: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 97eb4e5cb74..a497dced001 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8462,7 +8462,6 @@ let preConfigure = '' export LD=$CC ''; - propagatedBuildInputs = [ XSLoader ]; meta = { description = "Provide the stuff missing in List::Util in XS"; license = with stdenv.lib.licenses; [ asl20 ]; From 4b370f45c2033c64671b64e044fc7d84e8dc2448 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:42 +0000 Subject: [PATCH 23/59] [cpan2nix] perlPackages.LocaleMaketext: 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 a497dced001..db669dcfd2a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8530,13 +8530,7 @@ let }; }; - LocaleMaketext = buildPerlPackage { - name = "Locale-Maketext-1.28"; - src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Locale-Maketext-1.28.tar.gz; - sha256 = "1sgpcnh9kqdnsizpwxzsyfv44id7gxsgkd9bmnhmj4g8hfs9712p"; - }; - }; + LocaleMaketext = null; # part of Perl 5.26 LocaleMaketextFuzzy = buildPerlPackage { name = "Locale-Maketext-Fuzzy-0.11"; From 5bd2bb1e0db9a14bf90a74ce71240f6a880cc3a9 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:48 +0000 Subject: [PATCH 24/59] [cpan2nix] perlPackages.MathBigRat: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index db669dcfd2a..8b78f28ffc8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9198,7 +9198,6 @@ let url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; sha256 = "cea6c20afc6c10a3dc3b62a71df3f842dce13898443bd827242ff3f09f1f3d59"; }; - propagatedBuildInputs = [ MathBigInt ]; meta = { description = "Arbitrary big rational numbers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 2a2c9bff0f7e7368b983f1852e68a55dce46e658 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:52 +0000 Subject: [PATCH 25/59] [cpan2nix] perlPackages.ModuleCoreList: 5.20180820 -> 5.20180920 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b78f28ffc8..44a64e62c42 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9624,10 +9624,10 @@ let }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-5.20180820"; + name = "Module-CoreList-5.20180920"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180820.tar.gz; - sha256 = "1ccs5mqcfxjv8bax2nfsg11b2vc3sqyapfapxyzrjhaa2fmdn54l"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180920.tar.gz; + sha256 = "00gkfkajvamb207xslqakwpzyjdhbyf14l0bs9ywcw8q44n7ghaf"; }; meta = { homepage = http://dev.perl.org/; From 0432ee463f9c03cd99e3af44ae2c132e84a82b43 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:53 +0000 Subject: [PATCH 26/59] [cpan2nix] perlPackages.ModuleLoadConditional: 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 44a64e62c42..a00f330390e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9734,17 +9734,7 @@ let }; }; - ModuleLoadConditional = buildPerlPackage rec { - name = "Module-Load-Conditional-0.68"; - src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-Load-Conditional-0.68.tar.gz; - sha256 = "1zcq0s7q9bvk9wdv9ijfyddh3b8ck4n3w87rcx31lbsav5fba9vn"; - }; - meta = { - description = "Looking up module information / loading at runtime"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + ModuleLoadConditional = null; # part of Perl 5.26 ModuleManifest = buildPerlPackage { name = "Module-Manifest-1.09"; From fddc77f71f7c205f71904df5327cf9ca47a1208f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:53 +0000 Subject: [PATCH 27/59] [cpan2nix] perlPackages.ModuleMetadata: 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 a00f330390e..400ee1497fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9750,13 +9750,7 @@ let }; }; - ModuleMetadata = buildPerlPackage rec { - name = "Module-Metadata-1.000033"; - src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Module-Metadata-1.000033.tar.gz; - sha256 = "13pzydb22693l33rfx6drwbhjxj04q80ds4m2nn2sbmm95wwr5mw"; - }; - }; + ModuleMetadata = null; # part of Perl 5.26 ModulePath = buildPerlPackage rec { name = "Module-Path-0.19"; From ec1b5409fc9ec557e304ec5c5b8949b6a4051f7d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:55 +0000 Subject: [PATCH 28/59] [cpan2nix] perlPackages.Mojolicious: cleanup --- pkgs/top-level/perl-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 400ee1497fc..893d65f76ec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9916,8 +9916,6 @@ let url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; sha256 = "b266fd32f12cca2504be012e785f34eb09c0a132df52be183ff5d494e87f0b98"; }; - buildInputs = [ ExtUtilsMakeMaker ]; - propagatedBuildInputs = [ IOSocketIP JSONPP PodSimple TimeLocal ]; meta = { homepage = https://mojolicious.org; description = "Real-time web framework"; From 93795465a02f753c7803c57ba6e972bb1cb8c5c7 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:14:10 +0000 Subject: [PATCH 29/59] [cpan2nix] perlPackages.PerlOSType: 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 893d65f76ec..35e642a0586 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12099,13 +12099,7 @@ let doCheck = false; }; - PerlOSType = buildPerlPackage rec { - name = "Perl-OSType-1.010"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "1ch36kfjwm229xicb9k7b9fhisy58ihdr16vm8iwniymnna4kvg7"; - }; - }; + PerlOSType = null; # part of Perl 5.26 PerlTidy = buildPerlPackage rec { name = "Perl-Tidy-20180220"; From 85f063dacc951d88c863fa2f6a5b39d769f88b8f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:14:15 +0000 Subject: [PATCH 30/59] [cpan2nix] perlPackages.PodUsage: 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 35e642a0586..3f09588e638 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12884,17 +12884,7 @@ let }; }; - PodUsage = buildPerlPackage { - name = "Pod-Usage-1.69"; - src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Usage-1.69.tar.gz; - sha256 = "1a920c067b3c905b72291a76efcdf1935ba5423ab0187b9a5a63cfc930965132"; - }; - propagatedBuildInputs = [ podlators ]; - meta = { - description = "Pod::Usage extracts POD documentation and shows usage information"; - }; - }; + PodUsage = null; # part of Perl 5.26 PodWeaver = buildPerlPackage rec { name = "Pod-Weaver-4.015"; From fef6077d6c45eb9a2909c5734f8489af2ffa42ba Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:14:34 +0000 Subject: [PATCH 31/59] [cpan2nix] perlPackages.TermANSIColor: 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 3f09588e638..1be0a336c94 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14472,17 +14472,7 @@ let }; }; - TermANSIColor = buildPerlPackage { - name = "Term-ANSIColor-4.06"; - src = fetchurl { - url = mirror://cpan/authors/id/R/RR/RRA/Term-ANSIColor-4.06.tar.gz; - sha256 = "8161c7434b1984bde588d75f22c786c46cb6d35d264d58111db0b82537de4bad"; - }; - meta = { - description = "Color output using ANSI escape sequences"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + TermANSIColor = null; # part of Perl 5.26 TermCap = let version = "1.17"; in buildPerlPackage { name = "Term-Cap-${version}"; From a17d101d83dbbf976351667a996e1a324ff1578c Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:14:35 +0000 Subject: [PATCH 32/59] [cpan2nix] perlPackages.TermCap: removed built-in --- pkgs/top-level/perl-packages.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1be0a336c94..75cd1379e4a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14474,18 +14474,7 @@ let TermANSIColor = null; # part of Perl 5.26 - TermCap = let version = "1.17"; in buildPerlPackage { - name = "Term-Cap-${version}"; - src = fetchurl { - url = "mirror://cpan/authors/id/J/JS/JSTOWE/Term-Cap-${version}.tar.gz"; - sha256 = "0qyicyk4aikw6w3fm8c4y6hd7ff70crkl6bf64qmiakbgxy9p6p7"; - }; - meta = { - inherit version; - description = "Perl termcap interface"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + TermCap = null; # part of Perl 5.26 TermEncoding = buildPerlPackage { name = "Term-Encoding-0.02"; From a400a6e3bb4193229b816caf88649c962e235561 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:14:57 +0000 Subject: [PATCH 33/59] [cpan2nix] perlPackages.ThreadSemaphore: 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 75cd1379e4a..5cd265dd58c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16544,17 +16544,7 @@ let }; }; - ThreadSemaphore = buildPerlPackage { - name = "Thread-Semaphore-2.13"; - src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Semaphore-2.13.tar.gz; - sha256 = "e3fe2cc047575529c8ea4c168cef8fab2ec931729a1826ffca1ef63e7e45bc81"; - }; - meta = { - description = "Thread-safe semaphores"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + ThreadSemaphore = null; # part of Perl 5.26 Throwable = buildPerlPackage rec { name = "Throwable-0.200013"; From 8780d22f3dfcad76d414d0fb8cf8644f92acaebc Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:15:04 +0000 Subject: [PATCH 34/59] [cpan2nix] perlPackages.UnicodeNormalize: 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 5cd265dd58c..c940e6b9f98 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16959,17 +16959,7 @@ let }; }; - UnicodeNormalize = buildPerlPackage rec { - name = "Unicode-Normalize-1.25"; - src = fetchurl { - url = "mirror://cpan/authors/id/K/KH/KHW/${name}.tar.gz"; - sha256 = "00b33a75d3b356ade2e09391ea2d32fac881671c18b1eb26b9ca31273d5b046c"; - }; - meta = { - description = "Unicode Normalization Forms"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + UnicodeNormalize = null; # part of Perl 5.26 UnicodeString = buildPerlPackage rec { name = "Unicode-String-2.10"; From 41790ecab6a0e0d2294b4a44081ab7d29c9a9164 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:15:06 +0000 Subject: [PATCH 35/59] [cpan2nix] perlPackages.WWWFormUrlEncoded: 0.24 -> 0.25 --- pkgs/top-level/perl-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c940e6b9f98..eee5b64a3b5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17203,12 +17203,11 @@ let }; WWWFormUrlEncoded = buildPerlModule rec { - name = "WWW-Form-UrlEncoded-0.24"; + name = "WWW-Form-UrlEncoded-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.24.tar.gz; - sha256 = "04fh54zgmrlhrmdaqs2yrwqmqwk9hd737z7rnbbd438l36skn7vd"; + url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.25.tar.gz; + sha256 = "0kh7qrskhbk4j253pr2q4vpn73q5k6fj517m3lnj8n755z9adxz1"; }; - buildInputs = [ JSON ]; meta = { description = "parser and builder for application/x-www-form-urlencoded"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From dde3ebf389708c1ea318cc3480fa94527d5e5b76 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:15:09 +0000 Subject: [PATCH 36/59] [cpan2nix] perlPackages.XSLoader: 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 eee5b64a3b5..d00170e48d5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17707,17 +17707,7 @@ let }; }; - XSLoader = buildPerlPackage { - name = "XSLoader-0.24"; - src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.24.tar.gz; - sha256 = "0pyqr12jsqagna75fm2gijfzw06wy1hrh5chn9hwnmcfddda66g8"; - }; - meta = { - description = "Dynamically load C libraries into Perl code"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + XSLoader = null; # part of Perl 5.26 XSObjectMagic = buildPerlPackage rec { name = "XS-Object-Magic-0.04"; From dd4a0700edfcb910583b027a7dd37671765c9071 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:15:11 +0000 Subject: [PATCH 37/59] [cpan2nix] perlPackages.base: 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 d00170e48d5..c691c36d6ab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -709,13 +709,7 @@ let }; }; - base = buildPerlPackage { - name = "base-2.23"; - src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/base-2.23.tar.gz; - sha256 = "40f55841299a9fe6fab03cd098f94e9221fb516978e9ef40fd8ff2cbd6625dde"; - }; - }; + base = null; # part of Perl 5.26 BC = buildPerlPackage rec { name = "B-C-1.55"; From fa6238b39bb73f35f00e135332106d43b0eb65fa Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:15:48 +0000 Subject: [PATCH 38/59] [cpan2nix] perlPackages.NetDNS: 1.17 -> 1.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c691c36d6ab..51cad63de5d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11089,12 +11089,12 @@ let }; NetDNS = buildPerlPackage rec { - name = "Net-DNS-1.17"; + name = "Net-DNS-1.18"; src = fetchurl { url = "mirror://cpan/authors/id/N/NL/NLNETLABS/${name}.tar.gz"; - sha256 = "9a79fd8fea1a708726c18d193ae4437479206ccb20ffa7f0971371e172e2c2e0"; + sha256 = "52ce1494fc9707fd5a60ed71db5cde727157b7f2363787d730d4d1bd9800a9d3"; }; - propagatedBuildInputs = [ DigestHMAC IOSocketIP ]; + propagatedBuildInputs = [ DigestHMAC ]; makeMakerFlags = "--noonline-tests"; meta = { description = "Perl Interface to the Domain Name System"; From c239e0bebfe2227ca92d6f022716bed6f62df981 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:15:48 +0000 Subject: [PATCH 39/59] [cpan2nix] perlPackages.NetIDNEncode: 2.400 -> 2.401 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 51cad63de5d..82754f700ba 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11157,10 +11157,10 @@ let }; NetIDNEncode = buildPerlModule { - name = "Net-IDN-Encode-2.400"; + name = "Net-IDN-Encode-2.401"; src = fetchurl { - url = mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.400.tar.gz; - sha256 = "0a9knav5f9kjldrkxx1k47ivd3p23zkmi8aqgyhnxidhgasz1dlq"; + url = mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.401.tar.gz; + sha256 = "1b5hnlnaxnp9jzdk55dcfh4jviv9mv83y4plsr3hi7lkh06hwdyd"; }; buildInputs = [ TestNoWarnings ]; meta = { From 1da70e726f84be07fb0afed990160c705b3df2e5 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:15:50 +0000 Subject: [PATCH 40/59] [cpan2nix] perlPackages.SubInfo: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 82754f700ba..d4ae96a3ec5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14041,7 +14041,6 @@ let url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; sha256 = "ea3056d696bdeff21a99d340d5570887d39a8cc47bff23adfc82df6758cdd0ea"; }; - buildInputs = [ TestSimple13 ]; propagatedBuildInputs = [ Importer ]; meta = { description = "Tool for inspecting subroutines"; From fb70dbb2827b9e2af22cc771ccd691ac1891732f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:16:04 +0000 Subject: [PATCH 41/59] [cpan2nix] perlPackages.CryptOpenSSLRSA: 0.30 -> 0.31 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d4ae96a3ec5..61b43c02145 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3051,10 +3051,10 @@ let }; CryptOpenSSLRSA = buildPerlPackage rec { - name = "Crypt-OpenSSL-RSA-0.30"; + name = "Crypt-OpenSSL-RSA-0.31"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.30.tar.gz; - sha256 = "23e13531397af102db4fd24bcf70137add7c85c23cca697c43aa71c2959a29ac"; + url = mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz; + sha256 = "4173403ad4cf76732192099f833fbfbf3cd8104e0246b3844187ae384d2c5436"; }; propagatedBuildInputs = [ CryptOpenSSLRandom ]; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; From a172229664b7438011648f3c355b00c1137725d9 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:16:39 +0000 Subject: [PATCH 42/59] [cpan2nix] perlPackages.TextBibTeX: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 61b43c02145..2229ca10ae9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16012,7 +16012,6 @@ let description = "Interface to read and parse BibTeX files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [ ScalarListUtils ]; }; TextBrew = buildPerlPackage rec { From fd686b947e6e4810a18ab73e4a455c16a32d77b8 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:17:33 +0000 Subject: [PATCH 43/59] [cpan2nix] perlPackages.DataValidateDomain: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2229ca10ae9..f9824fda6aa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3493,7 +3493,7 @@ let url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; sha256 = "4470f253b8d2720a4dd3fa3ae550995417c2269f3be7ff030e01afa04a3a9421"; }; - buildInputs = [ Test2Suite TestSimple13 ]; + buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ NetDomainTLD ]; meta = { description = "Domain and host name validation"; From d4d9eed5e6f73f4f5604f43790f5f8e94b032eb8 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:17:38 +0000 Subject: [PATCH 44/59] [cpan2nix] perlPackages.Test2PluginNoWarnings: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f9824fda6aa..4058d1ad689 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14674,7 +14674,6 @@ let url = mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz; sha256 = "002qk6qsm0l6r2kaxywvc38w0yf0mlavgywq8li076pn6kcw3242"; }; - propagatedBuildInputs = [ TestSimple13 ]; buildInputs = [ IPCRun3 Test2Suite ]; meta = { description = "Fail if tests warn"; From 9adcdd61e9a6c7c2c077eca514df4cd43f3914cf Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:17:39 +0000 Subject: [PATCH 45/59] [cpan2nix] perlPackages.CookieBaker: 0.09 -> 0.10 --- 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 4058d1ad689..98a2e57630c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2690,10 +2690,10 @@ let }; CookieBaker = buildPerlModule rec { - name = "Cookie-Baker-0.09"; + name = "Cookie-Baker-0.10"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; - sha256 = "be020a634162b319cab55b6e2bf10556a33a210a2eee8a2f1aa1b19b5e33aa4f"; + sha256 = "b42bad15b12da4cdc5c90c902faf3ad484281a42203fa4e7652866434f6fa4dd"; }; buildInputs = [ ModuleBuildTiny TestTime ]; propagatedBuildInputs = [ URI ]; From 2a38d70964f08808d437a55b27faf5ef384f5b3a Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:17:42 +0000 Subject: [PATCH 46/59] [cpan2nix] perlPackages.TestScript: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 98a2e57630c..6ffa00d6014 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15663,7 +15663,7 @@ let buildInputs = [ Test2Suite ]; - propagatedBuildInputs = [ CaptureTiny ProbePerl TestSimple13 ]; + propagatedBuildInputs = [ CaptureTiny ProbePerl ]; }; TestSharedFork = buildPerlPackage rec { From e3eaacf78663b3b37da8fa637906a1083e54f30b Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:17:46 +0000 Subject: [PATCH 47/59] [cpan2nix] perlPackages.ListAllUtils: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6ffa00d6014..54f3a45ef1d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8402,7 +8402,7 @@ let url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.14.tar.gz; sha256 = "e45aa65927ae1975a000cc2fed14274627fa5e2bd09bab826a5f2c41d17ef6cd"; }; - propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ScalarListUtils ]; + propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ]; meta = { description = "Combines List::Util and List::MoreUtils in one bite-sized package"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From f12f974404294809e946708fe6e3f07c10629e1e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:17:48 +0000 Subject: [PATCH 48/59] [cpan2nix] perlPackages.TestMost: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 54f3a45ef1d..205fb1c8a76 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15325,7 +15325,7 @@ let description = "Most commonly needed test functions and features"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ TestDeep TestDifferences TestException TestSimple13 TestWarn ]; + buildInputs = [ TestDeep TestDifferences TestException TestWarn ]; }; TestNeeds = buildPerlPackage rec { From d8418d75b588ada024dab2a5db8e827896d4038f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:18:24 +0000 Subject: [PATCH 49/59] [cpan2nix] perlPackages.Mouse: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 205fb1c8a76..8f40dfd12db 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10799,7 +10799,7 @@ let url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.6.tar.gz; sha256 = "1j3048ip691j91rdig6wrlg6i4jdzhszxmz5pi2g7n355rl2w00l"; }; - buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny self.version ]; + buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; perlPreHook = "export LD=$CC"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector"; hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; From f7864bbab1411b0c4c882646327e50b00568eafe Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:18:30 +0000 Subject: [PATCH 50/59] [cpan2nix] perlPackages.XMLXPath: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8f40dfd12db..73342fafaa0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17526,7 +17526,7 @@ let sha256 = "9e6ac67c2cead5f918a060b8b9ccdbdcaa6d610be8517bba42a96cd56748b512"; }; buildInputs = [ PathTiny ]; - propagatedBuildInputs = [ ScalarListUtils XMLParser ]; + propagatedBuildInputs = [ XMLParser ]; meta = { description = "Modules for parsing and evaluating XPath statements"; license = stdenv.lib.licenses.artistic2; From 93c904a369e5de1293c4ed5bb560daa631f65308 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:18:31 +0000 Subject: [PATCH 51/59] [cpan2nix] perlPackages.ArchiveTarWrapper: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 73342fafaa0..42d5057b7b5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -511,7 +511,7 @@ let meta = { description = "API wrapper around the 'tar' utility"; }; - buildInputs = [ Dumbbench TestSimple13 ]; + buildInputs = [ Dumbbench ]; }; ArchiveZip = buildPerlPackage { From b70d37d67c44a89a093d79db4646777ea15ca02f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:18:35 +0000 Subject: [PATCH 52/59] [cpan2nix] perlPackages.EmailSender: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 42d5057b7b5..46f93c71478 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5011,7 +5011,7 @@ let sha256 = "c412372938510283d8c850127895e09c2b670f892e1c3992fd54c0c1a9064f14"; }; buildInputs = [ CaptureTiny ]; - propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike ScalarListUtils SubExporter Throwable TryTiny libnet ]; + propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike SubExporter Throwable TryTiny ]; meta = { homepage = https://github.com/rjbs/Email-Sender; description = "A library for sending email"; From eea9f82e9c3586884e883182557464bfb29372ae Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:18:36 +0000 Subject: [PATCH 53/59] [cpan2nix] perlPackages.ParamsValidationCompiler: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 46f93c71478..2d4b23c3135 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11725,7 +11725,7 @@ let sha256 = "1jqn1l4m4i341g14kmjsf3a1kn7vv6z89cix0xjjgr1v70iywnyw"; }; propagatedBuildInputs = [ EvalClosure ExceptionClass ]; - buildInputs = [ Specio Test2PluginNoWarnings Test2Suite TestSimple13 TestWithoutModule ]; + buildInputs = [ Specio Test2PluginNoWarnings Test2Suite TestWithoutModule ]; meta = { description = "Build an optimized subroutine parameter validator once, use it forever"; license = with stdenv.lib.licenses; [ artistic2 ]; From 8674253b79c55f3d34584d034850dd63382b4392 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:18:58 +0000 Subject: [PATCH 54/59] [cpan2nix] perlPackages.Appperlbrew: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2d4b23c3135..8e8e6ab48a6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -344,7 +344,7 @@ let sha256 = "0j21pcd82q9raz2hnh1qmsk7hsfzz9pzadvql6skdmhwshs9a5la"; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass PodMarkdown TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; - propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodUsage locallib ]; + propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ]; preConfigure = '' patchShebangs . From 326138d201560a8febdc1ee9183d24f4310cf109 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:19:00 +0000 Subject: [PATCH 55/59] [cpan2nix] perlPackages.DateTimeLocale: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8e8e6ab48a6..f235696a2c2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3823,7 +3823,7 @@ let sha256 = "757b3915c6b2aac89462c52fed36543f27dfb66abc98c895523d2ab95da65f94"; }; buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple TestFatal TestFileShareDir TestRequires TestWarnings ]; - propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler ScalarListUtils Specio namespaceautoclean ]; + propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler Specio namespaceautoclean ]; meta = { description = "Localization support for DateTime.pm"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 4b4522d4d6528367c9cabacda5c6a5633cbf8197 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:19:11 +0000 Subject: [PATCH 56/59] [cpan2nix] perlPackages.Moose: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f235696a2c2..618b509ac13 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9980,7 +9980,7 @@ let sha256 = "973d0a35d9f39bf93bbc5206c25f5ec3651f96356f082d31873c0ac9a5c1cd82"; }; buildInputs = [ CPANMetaCheck TestCleanNamespaces TestFatal TestRequires ]; - propagatedBuildInputs = [ ClassLoadXS DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS ScalarListUtils SubExporter ]; + propagatedBuildInputs = [ ClassLoadXS DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS SubExporter ]; preConfigure = '' export LD=$CC ''; From 005f851d8577c4d84d3de06989c235714500d96e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:19:21 +0000 Subject: [PATCH 57/59] [cpan2nix] perlPackages.TestRoutine: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 618b509ac13..83e2cb684f1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15521,7 +15521,7 @@ let sha256 = "0n6k310v2py787lkvhzrn8vndws9icdf8mighgl472k0x890xm5s"; }; buildInputs = [ TestAbortable TestFatal ]; - propagatedBuildInputs = [ Moose TestSimple13 namespaceautoclean ]; + propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { homepage = https://github.com/rjbs/Test-Routine; description = "Composable units of assertion"; From 580f964503c938f51790aaa2d08ea89e28ca9329 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:20:00 +0000 Subject: [PATCH 58/59] [cpan2nix] perlPackages.CatalystRuntime: 5.90118 -> 5.90119 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 83e2cb684f1..b162c2e9614 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1317,10 +1317,10 @@ let }; CatalystRuntime = buildPerlPackage rec { - name = "Catalyst-Runtime-5.90118"; + name = "Catalyst-Runtime-5.90119"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90118.tar.gz; - sha256 = "a3e979fc822f500d065e39a03d1883179bfdae77a8372cce0070efd1bf1e9a33"; + url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Runtime-5.90119.tar.gz; + sha256 = "19fff77c70a4fc8df2909db82629fda7f25d3e5d01f0152a145f8f8973ea87c7"; }; buildInputs = [ TestFatal TypeTiny ]; propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; From 46327afd1c4c988b8277566aef4340bf24f581c6 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:26:29 +0000 Subject: [PATCH 59/59] perl-packages.nix: group aliases --- pkgs/top-level/perl-packages.nix | 48 +++++++++++--------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b162c2e9614..854e403f0c4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -407,8 +407,6 @@ let }; }; - AttributeHandlers = null; # part of Perl 5.26 - AttributeParamsValidate = buildPerlPackage { name = "Attribute-Params-Validate-1.21"; src = fetchurl { @@ -709,8 +707,6 @@ let }; }; - base = null; # part of Perl 5.26 - BC = buildPerlPackage rec { name = "B-C-1.55"; src = fetchurl { @@ -2789,8 +2785,6 @@ let }; }; - CPANMeta = null; # part of Perl 5.26 - CPANMetaCheck = buildPerlPackage rec { name = "CPAN-Meta-Check-0.014"; src = fetchurl { @@ -2804,10 +2798,6 @@ let }; }; - CPANMetaRequirements = null; # part of Perl 5.26 - - CPANMetaYAML = null; # part of Perl 5.26 - CPANPerlReleases = buildPerlPackage rec { name = "CPAN-Perl-Releases-3.76"; src = fetchurl { @@ -4438,8 +4428,6 @@ let }; }; - DigestMD5 = null; # part of Perl 5.26 - DigestMD5File = buildPerlPackage { name = "Digest-MD5-File-0.08"; src = fetchurl { @@ -8524,8 +8512,6 @@ let }; }; - LocaleMaketext = null; # part of Perl 5.26 - LocaleMaketextFuzzy = buildPerlPackage { name = "Locale-Maketext-Fuzzy-0.11"; src = fetchurl { @@ -9728,8 +9714,6 @@ let }; }; - ModuleLoadConditional = null; # part of Perl 5.26 - ModuleManifest = buildPerlPackage { name = "Module-Manifest-1.09"; src = fetchurl { @@ -9744,8 +9728,6 @@ let }; }; - ModuleMetadata = null; # part of Perl 5.26 - ModulePath = buildPerlPackage rec { name = "Module-Path-0.19"; src = fetchurl { @@ -12093,8 +12075,6 @@ let doCheck = false; }; - PerlOSType = null; # part of Perl 5.26 - PerlTidy = buildPerlPackage rec { name = "Perl-Tidy-20180220"; src = fetchurl { @@ -12878,8 +12858,6 @@ let }; }; - PodUsage = null; # part of Perl 5.26 - PodWeaver = buildPerlPackage rec { name = "Pod-Weaver-4.015"; src = fetchurl { @@ -14465,10 +14443,6 @@ let }; }; - TermANSIColor = null; # part of Perl 5.26 - - TermCap = null; # part of Perl 5.26 - TermEncoding = buildPerlPackage { name = "Term-Encoding-0.02"; src = fetchurl { @@ -16535,8 +16509,6 @@ let }; }; - ThreadSemaphore = null; # part of Perl 5.26 - Throwable = buildPerlPackage rec { name = "Throwable-0.200013"; src = fetchurl { @@ -16950,8 +16922,6 @@ let }; }; - UnicodeNormalize = null; # part of Perl 5.26 - UnicodeString = buildPerlPackage rec { name = "Unicode-String-2.10"; src = fetchurl { @@ -17698,8 +17668,6 @@ let }; }; - XSLoader = null; # part of Perl 5.26 - XSObjectMagic = buildPerlPackage rec { name = "XS-Object-Magic-0.04"; src = fetchurl { @@ -17794,6 +17762,22 @@ let DigestSHA = null; "if" = null; TestSimple = null; + AttributeHandlers = null; # part of Perl 5.26 + base = null; # part of Perl 5.26 + CPANMeta = null; # part of Perl 5.26 + CPANMetaRequirements = null; # part of Perl 5.26 + CPANMetaYAML = null; # part of Perl 5.26 + DigestMD5 = null; # part of Perl 5.26 + LocaleMaketext = null; # part of Perl 5.26 + ModuleLoadConditional = null; # part of Perl 5.26 + ModuleMetadata = null; # part of Perl 5.26 + PerlOSType = null; # part of Perl 5.26 + PodUsage = null; # part of Perl 5.26 + TermANSIColor = null; # part of Perl 5.26 + TermCap = null; # part of Perl 5.26 + ThreadSemaphore = null; # part of Perl 5.26 + UnicodeNormalize = null; # part of Perl 5.26 + XSLoader = null; # part of Perl 5.26 ArchiveZip_1_53 = self.ArchiveZip; Autobox = self.autobox;