Merge pull request #52062 from volth/perl526-drop

perl526: drop
This commit is contained in:
Jörg Thalheim 2018-12-18 17:02:01 +00:00 committed by GitHub
commit 1148ce1b60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 49 additions and 178 deletions

View file

@ -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" ];

View file

@ -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"
'';

View file

@ -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

View file

@ -74,7 +74,6 @@ stdenv.mkDerivation rec {
Moo
NetDBus
OpenGL
threads
XMLSAX
]);

View file

@ -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 ])}"
'';

View file

@ -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";

View file

@ -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

View file

@ -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
'';

View file

@ -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 \

View file

@ -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 ];
@ -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} \

View file

@ -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

View file

@ -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";

View file

@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
perl
DBI
DBDSQLite
DigestMD5
HTMLTagset
TimeDate # == DateParse
HTMLTemplate

View file

@ -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; {

View file

@ -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
];

View file

@ -7846,7 +7846,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 { };
@ -13249,10 +13249,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;

View file

@ -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;
@ -1088,18 +1088,6 @@ 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 ];
};
};
CarpAlways = buildPerlPackage rec {
name = "Carp-Always-0.16";
src = fetchurl {
@ -5318,14 +5306,6 @@ 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";
};
};
ExtUtilsCChecker = buildPerlModule rec {
name = "ExtUtils-CChecker-0.10";
src = fetchurl {
@ -5466,14 +5446,6 @@ let
};
};
ExtUtilsParseXS = buildPerlPackage rec {
name = "ExtUtils-ParseXS-3.35";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SM/SMUELLER/${name}.tar.gz";
sha256 = "077fqiyabydm8j34wxzxwxskyidh8nmwq9gskaxai8kq298z1pj1";
};
};
ExtUtilsPkgConfig = buildPerlPackage rec {
name = "ExtUtils-PkgConfig-1.16";
src = fetchurl {
@ -6198,18 +6170,6 @@ 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 ];
};
};
FinanceQuote = buildPerlPackage rec {
name = "Finance-Quote-1.47";
src = fetchurl {
@ -7716,18 +7676,6 @@ 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 ];
};
};
IOSocketInet6 = buildPerlModule rec {
name = "IO-Socket-INET6-2.72";
src = fetchurl {
@ -12101,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;
@ -13391,18 +13339,6 @@ 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 ];
};
};
SerealDecoder = buildPerlPackage rec {
name = "Sereal-Decoder-4.005";
src = fetchurl {
@ -13573,22 +13509,6 @@ 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 ];
};
};
Socket6 = buildPerlPackage rec {
name = "Socket6-0.29";
src = fetchurl {
@ -15215,20 +15135,6 @@ 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 ];
};
};
TestHarnessStraps = buildPerlModule {
name = "Test-Harness-Straps-0.30";
src = fetchurl {
@ -16653,18 +16559,6 @@ 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 ];
};
};
threadsshared = buildPerlPackage rec {
name = "threads-shared-1.58";
src = fetchurl {
@ -16851,14 +16745,6 @@ 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";
};
};
TimeLocal = buildPerlPackage {
name = "Time-Local-1.28";
src = fetchurl {
@ -17047,18 +16933,6 @@ 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 ];
};
};
UnicodeLineBreak = buildPerlPackage rec {
name = "Unicode-LineBreak-2018.003";
src = fetchurl {
@ -17944,6 +17818,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.