Merge pull request #48725 from volth/pp-cleanup

perlPackages: fix evaluate with allowAliases=false
This commit is contained in:
Jörg Thalheim 2018-10-21 18:34:20 +01:00 committed by GitHub
commit 2b25e95e23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -555,8 +555,6 @@ let
};
};
ArchiveZip_1_53 = ArchiveZip;
AudioScan = buildPerlPackage rec {
name = "Audio-Scan-1.01";
src = fetchurl {
@ -4473,7 +4471,6 @@ let
};
};
DigestHMAC_SHA1 = DigestHMAC;
DigestJHash = buildPerlPackage rec {
name = "Digest-JHash-0.10";
src = fetchurl {
@ -11356,7 +11353,7 @@ let
url = "mirror://cpan/authors/id/I/IV/IVAN/${name}.tar.gz";
sha256 = "88a9b2df69e769e5855a408b19f61915b82e8fe070ab5cf4d525dd3b8bbe31c1";
};
propagatedBuildInputs = [ pkgs.openssl Carp Exporter IO NetSSH StringShellQuote ];
propagatedBuildInputs = [ pkgs.openssl Carp IO NetSSH StringShellQuote ];
patchPhase = ''
sed -i 's|$scp = "scp";|$scp = "${pkgs.openssh}/bin/scp";|' SCP.pm
'';
@ -11449,7 +11446,7 @@ let
url = "mirror://cpan/authors/id/I/IV/IVAN/${name}.tar.gz";
sha256 = "7c71c7c3cbe953234dfe25bcc1ad7edb0e1f5a0578601f5523bc6070262a3817";
};
propagatedBuildInputs = [ pkgs.openssl Exporter IO ];
propagatedBuildInputs = [ pkgs.openssl IO ];
patchPhase = ''
sed -i 's|$ssh = "ssh";|$ssh = "${pkgs.openssh}/bin/ssh";|' SSH.pm
'';
@ -12114,7 +12111,7 @@ let
sha256 = "18wxvp7psqrx0zdvg47azrals572hv9fx1s3p0q65s87lnk3q63l";
};
outputs = [ "out" ];
buildInputs = [ DBDmysql DBI DigestMD5 IOSocketSSL TermReadKey TimeHiRes ];
buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey TimeHiRes ];
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;
@ -13431,7 +13428,6 @@ let
sha256 = "17syqbq17qw6ajg3w88q9ljdm4c2b7zadq9pwshxxgyijg8dlfh4";
};
buildInputs = [ TestDeep TestDifferences TestWarn TestLongString ];
propagatedBuildInputs = [ XSLoader ];
preBuild = ''ls'';
meta = {
homepage = https://github.com/Sereal/Sereal;
@ -13448,7 +13444,7 @@ let
sha256 = "02hbk5dwq7fpnyb3vp7xxhb41ra48xhghl13p9pjq9lzsqlb6l19";
};
buildInputs = [ TestDeep TestDifferences TestWarn TestLongString ];
propagatedBuildInputs = [ XSLoader SerealDecoder ];
propagatedBuildInputs = [ SerealDecoder ];
meta = {
homepage = https://github.com/Sereal/Sereal;
description = "Fast, compact, powerful binary deserialization";
@ -14141,7 +14137,7 @@ let
sha256 = "1y9lfhxgwyysybing72n3hng2db5njpk2dbb80vskdz75r7ffqjp";
};
buildInputs = [ ArchiveZip_1_53 pkgs.file ];
buildInputs = [ ArchiveZip pkgs.file ];
meta.broken = true;
};
@ -14155,7 +14151,7 @@ let
sha256 = "1y9lfhxgwyysybing72n3hng2db5njpk2dbb80vskdz75r7ffqjp";
};
buildInputs = [ ArchiveZip_1_53 libfile-stripnondeterminism pkgs.file ];
buildInputs = [ ArchiveZip libfile-stripnondeterminism pkgs.file ];
meta = with stdenv.lib; {
description = "A Perl module for stripping bits of non-deterministic information";
@ -14221,7 +14217,6 @@ let
};
};
SubExporterUtil = SubExporter;
SubIdentify = buildPerlPackage rec {
name = "Sub-Identify-0.14";
src = fetchurl {