Merge remote-tracking branch 'origin/perl-5.22' into staging

Small number of regressions: http://hydra.nixos.org/eval/1239239?compare=1237919#tabs-now-fail
This commit is contained in:
Eelco Dolstra 2016-03-07 11:58:17 +01:00
commit 669d59711f
2 changed files with 75 additions and 64 deletions

View file

@ -113,7 +113,7 @@ let
in rec { in rec {
perl = perl520; perl = perl522;
perl520 = common { perl520 = common {
version = "5.20.3"; version = "5.20.3";

View file

@ -1422,7 +1422,7 @@ let self = _self // overrides; _self = with self; {
sha256 = "0k8rcmgl9ysk6h4racd5sximida5ypn8fdzi7q34rpq4l7xqcm2n"; sha256 = "0k8rcmgl9ysk6h4racd5sximida5ypn8fdzi7q34rpq4l7xqcm2n";
}; };
buildInputs = [ TestDeep TestWarn ]; buildInputs = [ TestDeep TestWarn ];
propagatedBuildInputs = [ HTMLParser self."if" ]; propagatedBuildInputs = [ HTMLParser ];
meta = { meta = {
homepage = https://metacpan.org/module/CGI; homepage = https://metacpan.org/module/CGI;
description = "Handle Common Gateway Interface requests and responses"; description = "Handle Common Gateway Interface requests and responses";
@ -1719,6 +1719,11 @@ let self = _self // overrides; _self = with self; {
url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
sha256 = "09ifd6v0c94vr20n9yr1dxgcp7hyscqq851szdip7y24bd26nlbc"; sha256 = "09ifd6v0c94vr20n9yr1dxgcp7hyscqq851szdip7y24bd26nlbc";
}; };
buildInputs = [ ModuleBuild ];
meta = {
description = "Provide utility methods for factory classes";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
}; };
ClassInspector = buildPerlPackage { ClassInspector = buildPerlPackage {
@ -3010,7 +3015,8 @@ let self = _self // overrides; _self = with self; {
url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ICal-0.09.tar.gz; url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ICal-0.09.tar.gz;
sha256 = "8b09f6539f5e9c0df0e6135031699ed4ef9eef8165fc80aefeecc817ef997c33"; sha256 = "8b09f6539f5e9c0df0e6135031699ed4ef9eef8165fc80aefeecc817ef997c33";
}; };
propagatedBuildInputs = [ DateTime DateTimeEventICal DateTimeSet DateTimeTimeZone ParamsValidate ]; buildInputs = [ ModuleBuild ];
propagatedBuildInputs = [ DateTime DateTimeEventICal DateTimeSet DateTimeTimeZone ];
meta = { meta = {
description = "Parse and format iCal datetime and duration strings"; description = "Parse and format iCal datetime and duration strings";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@ -3173,7 +3179,7 @@ let self = _self // overrides; _self = with self; {
url = mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz; url = mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz;
sha256 = "17e6d202e7ac6049523048e97bb8f195e3c79208570da1504f4313584e487a79"; sha256 = "17e6d202e7ac6049523048e97bb8f195e3c79208570da1504f4313584e487a79";
}; };
buildInputs = [ TestMost ]; buildInputs = [ TestMost ModuleBuild ];
propagatedBuildInputs = [ DateTime DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ]; propagatedBuildInputs = [ DateTime DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ];
meta = { meta = {
description = "Parse a date/time string using the best method available"; description = "Parse a date/time string using the best method available";
@ -3216,6 +3222,15 @@ let self = _self // overrides; _self = with self; {
propagatedBuildInputs = [ IOCaptureOutput ]; propagatedBuildInputs = [ IOCaptureOutput ];
}; };
DevelCheckOS = buildPerlPackage rec {
name = "Devel-CheckOS-1.76";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DC/DCANTRELL/${name}.tar.gz";
sha256 = "f83fb4cb8de060f607214b1e88c98ac6c4e065371e646fe896f16ea887aecb0c";
};
propagatedBuildInputs = [ DataCompare FileFindRule ];
};
DevelDProf = buildPerlPackage { DevelDProf = buildPerlPackage {
name = "Devel-DProf-20110802.00"; name = "Devel-DProf-20110802.00";
src = fetchurl { src = fetchurl {
@ -3611,14 +3626,15 @@ let self = _self // overrides; _self = with self; {
}; };
DevelSymdump = buildPerlPackage rec { DevelSymdump = buildPerlPackage rec {
name = "Devel-Symdump-2.11"; name = "Devel-Symdump-2.15";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz";
sha256 = "0i5m2w8rsmp5lqi1y5y6b6938pidpz9hg92xahrshaddph00358i"; sha256 = "76c2a90d31318204ecf1977f0217ce57b142e6681fe2b99fb8789efc5dd86f41";
};
meta = {
description = "Dump symbol names or the symbol table";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
}; };
propagatedBuildInputs = [
TestPod /* cyclic dependency: TestPodCoverage */
];
}; };
Digest = buildPerlPackage { Digest = buildPerlPackage {
@ -5908,18 +5924,7 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
"if" = buildPerlPackage rec { "if" = null;
name = "if-0.0606";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
sha256 = "63d69282d6c4c9e76370b78d770ca720cea88cfe5ee5b612709240fc6078d50e";
};
meta = {
description = "C<use> a Perl module if a condition holds (also can C<no> a module)";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.rycee ];
};
};
# For backwards compatibility. # For backwards compatibility.
if_ = self."if"; if_ = self."if";
@ -6640,13 +6645,15 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
ListMoreUtils = buildPerlPackage { ListMoreUtils = buildPerlPackage rec {
name = "List-MoreUtils-0.33"; name = "List-MoreUtils-0.413";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/A/AD/ADAMK/List-MoreUtils-0.33.tar.gz; url = "mirror://cpan/authors/id/R/RE/REHSACK/${name}.tar.gz";
sha256 = "1bcljhhsk5g0xykvgbxz10ilmj02s58ydiy3g8hbzdr29i20np1i"; sha256 = "4d6429d5672ce74a59d6490320252cb8b5b8285db8fe9c6551a4162e5375ef37";
}; };
propagatedBuildInputs = [ ExporterTiny ];
meta = { meta = {
homepage = https://metacpan.org/release/List-MoreUtils;
description = "Provide the stuff missing in List::Util"; description = "Provide the stuff missing in List::Util";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
}; };
@ -7529,11 +7536,11 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
ModulePluggable = buildPerlPackage { ModulePluggable = buildPerlPackage rec {
name = "Module-Pluggable-5.1"; name = "Module-Pluggable-5.2";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-5.1.tar.gz; url = "mirror://cpan/authors/id/S/SI/SIMONW/${name}.tar.gz";
sha256 = "0vwi433pk7n1ia5wy67j3545jvmjf1hb4jwcvzrz25mv8d03bp72"; sha256 = "b3f2ad45e4fd10b3fb90d912d78d8b795ab295480db56dc64e86b9fa75c5a6df";
}; };
patches = [ patches = [
# !!! merge this patch into Perl itself (which contains Module::Pluggable as well) # !!! merge this patch into Perl itself (which contains Module::Pluggable as well)
@ -7573,6 +7580,7 @@ let self = _self // overrides; _self = with self; {
url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.014.tar.gz; url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.014.tar.gz;
sha256 = "19326f094jmjs6mgpwkyisid54k67w34br8yfh0gvaaml87gwi2c"; sha256 = "19326f094jmjs6mgpwkyisid54k67w34br8yfh0gvaaml87gwi2c";
}; };
buildInputs = [ ModuleBuild ];
meta = { meta = {
homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
description = "Runtime module handling"; description = "Runtime module handling";
@ -7955,15 +7963,16 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
MooseXDaemonize = buildPerlPackage { MooseXDaemonize = buildPerlPackage rec {
name = "MooseX-Daemonize-0.15"; name = "MooseX-Daemonize-0.21";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/M/MI/MICHAELR/MooseX-Daemonize-0.15.tar.gz; url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
sha256 = "1h6rzdmk68q4p0nh2bzmwwvr5iaf7pvdfrpwdxmr3z5pc64wajvd"; sha256 = "111f391221d00f8b09cdcc6c806ab114324cf7f529d12f627fb97d054da42225";
}; };
buildInputs = [ TestMoose ]; buildInputs = [ DevelCheckOS ModuleBuildTiny Moose TestFatal ];
propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass ]; propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass namespaceautoclean ];
meta = { meta = {
homepage = https://github.com/moose/MooseX-Daemonize;
description = "Role for daemonizing your Moose based application"; description = "Role for daemonizing your Moose based application";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
}; };
@ -8246,7 +8255,7 @@ let self = _self // overrides; _self = with self; {
url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
sha256 = "e9e8c36284cf1adc6563c980c0a4f0a7df720dbaaece0dd6be66b975dde5db7a"; sha256 = "e9e8c36284cf1adc6563c980c0a4f0a7df720dbaaece0dd6be66b975dde5db7a";
}; };
buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires self."if" ]; buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires ];
propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods SubName namespaceautoclean ]; propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods SubName namespaceautoclean ];
meta = { meta = {
homepage = https://github.com/moose/MooseX-Types; homepage = https://github.com/moose/MooseX-Types;
@ -8263,7 +8272,7 @@ let self = _self // overrides; _self = with self; {
sha256 = "ff0c963f5e8304acb5f64bdf9ba1f19284311148e1a8f0d1f81f123f9950f5f2"; sha256 = "ff0c963f5e8304acb5f64bdf9ba1f19284311148e1a8f0d1f81f123f9950f5f2";
}; };
buildInputs = [ ModuleBuildTiny TestDeep TestWarnings perl ]; buildInputs = [ ModuleBuildTiny TestDeep TestWarnings perl ];
propagatedBuildInputs = [ MooseXTypes self."if" ]; propagatedBuildInputs = [ MooseXTypes ];
meta = { meta = {
homepage = https://github.com/moose/MooseX-Types-Common; homepage = https://github.com/moose/MooseX-Types-Common;
description = "A library of commonly used type constraints"; description = "A library of commonly used type constraints";
@ -9565,13 +9574,11 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
PadWalker = buildPerlPackage { PadWalker = buildPerlPackage rec {
name = "PadWalker-1.98"; name = "PadWalker-2.2";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-1.98.tar.gz; url = "mirror://cpan/authors/id/R/RO/ROBIN/${name}.tar.gz";
sha256 = "0v2pldb5awflf10w1p9pwn8w37lkpfc2h459gd9zz6p57883ibw0"; sha256 = "fc1df2084522e29e892da393f3719d2c1be0da022fdd89cff4b814167aecfea3";
};
meta = {
}; };
}; };
@ -10354,22 +10361,20 @@ let self = _self // overrides; _self = with self; {
}; };
SQLTranslator = buildPerlPackage rec { SQLTranslator = buildPerlPackage rec {
name = "SQL-Translator-0.11020"; name = "SQL-Translator-0.11021";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz";
sha256 = "18mqnppwk1076sxcink5ajk75ysway0bd049hwxvk8md39x0y7ar"; sha256 = "64cb38a9f78367bc115359a999003bbeb3c32cc75bba8306ec1a938fc441bfd1";
}; };
propagatedBuildInputs = [ buildInputs = [ JSON TestDifferences TestException XMLWriter YAML ];
ClassBase ClassDataInheritable ClassMakeMethods DigestSHA1 CarpClan IOStringy propagatedBuildInputs = [ CarpClan DBI FileShareDir ListMoreUtils Moo PackageVariant ParseRecDescent TryTiny ];
ParseRecDescent ClassAccessor DBI FileShareDir XMLWriter YAML TestDifferences
TemplateToolkit GraphViz XMLLibXML TestPod TextRecordParser HTMLParser
SpreadsheetParseExcel Graph GD Moo TryTiny PackageVariant
];
meta = { meta = {
description = "SQL DDL transformations and more";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
}; };
PackageVariant = buildPerlPackage { PackageVariant = buildPerlPackage {
name = "Package-Variant-1.002002"; name = "Package-Variant-1.002002";
src = fetchurl { src = fetchurl {
@ -11605,17 +11610,17 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
TestMemoryCycle = buildPerlPackage { TestMemoryCycle = buildPerlPackage rec {
name = "Test-Memory-Cycle-1.04"; name = "Test-Memory-Cycle-1.06";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Memory-Cycle-1.04.tar.gz; url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
sha256 = "09qj48gmj25xgm0k12n1xx7chdk9gdy3sck4pabvzs0v00nmv9p5"; sha256 = "9d53ddfdc964cd8454cb0da4c695b6a3ae47b45839291c34cb9d8d1cfaab3202";
}; };
propagatedBuildInputs = [ DevelCycle PadWalker ]; propagatedBuildInputs = [ DevelCycle PadWalker ];
meta = { meta = {
description = "Verifies code hasn't left circular references"; description = "Verifies code hasn't left circular references";
maintainers = with maintainers; [ ocharles ]; maintainers = with maintainers; [ ocharles ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
}; };
}; };
@ -11647,13 +11652,18 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
TestMockObject = buildPerlPackage { TestMockObject = buildPerlPackage rec {
name = "Test-MockObject-1.09"; name = "Test-MockObject-1.20150527";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.09.tar.gz; url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz";
sha256 = "1cz385x0jrkj84nmfs6qyzwwvv8m9v8r2isagfj1zxvhdw49wdyy"; sha256 = "adf1357a9014b3a397ff7ecbf1835dec376a67a37bb2e788734a627e17dc1d98";
};
buildInputs = [ TestException TestWarn CGI ];
propagatedBuildInputs = [ UNIVERSALcan UNIVERSALisa ];
meta = {
description = "Perl extension for emulating troublesome interfaces";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
}; };
propagatedBuildInputs = [TestException UNIVERSALisa UNIVERSALcan];
}; };
TestMoose = Moose; TestMoose = Moose;
@ -11982,7 +11992,7 @@ let self = _self // overrides; _self = with self; {
url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
sha256 = "ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08"; sha256 = "ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08";
}; };
buildInputs = [ TestTester CPANMetaCheck ModuleMetadata self."if" ]; buildInputs = [ TestTester CPANMetaCheck ModuleMetadata ];
meta = { meta = {
homepage = https://github.com/karenetheridge/Test-Warnings; homepage = https://github.com/karenetheridge/Test-Warnings;
description = "Test for warnings and the lack of them"; description = "Test for warnings and the lack of them";
@ -12011,6 +12021,7 @@ let self = _self // overrides; _self = with self; {
url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.44.tar.gz; url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.44.tar.gz;
sha256 = "062pj242vsc73bw11jqpap92ax9wzc9f2m4xhyp1wzrwkfchpl2q"; sha256 = "062pj242vsc73bw11jqpap92ax9wzc9f2m4xhyp1wzrwkfchpl2q";
}; };
buildInputs = [ CGI ];
propagatedBuildInputs = [ CarpAssertMore HTMLTree HTTPServerSimple LWP TestLongString URI WWWMechanize ]; propagatedBuildInputs = [ CarpAssertMore HTMLTree HTTPServerSimple LWP TestLongString URI WWWMechanize ];
meta = { meta = {
homepage = https://github.com/petdance/test-www-mechanize; homepage = https://github.com/petdance/test-www-mechanize;
@ -12053,7 +12064,7 @@ let self = _self // overrides; _self = with self; {
url = mirror://cpan/authors/id/L/LB/LBROCARD/Test-WWW-Mechanize-PSGI-0.35.tar.gz; url = mirror://cpan/authors/id/L/LB/LBROCARD/Test-WWW-Mechanize-PSGI-0.35.tar.gz;
sha256 = "1hih8s49zf38bisvhnhzrrj0zwyiivkrbs7nmmdqm1qqy27wv7pc"; sha256 = "1hih8s49zf38bisvhnhzrrj0zwyiivkrbs7nmmdqm1qqy27wv7pc";
}; };
buildInputs = [ TestPod ]; buildInputs = [ TestPod CGI ];
propagatedBuildInputs = [ Plack TestWWWMechanize TryTiny ]; propagatedBuildInputs = [ Plack TestWWWMechanize TryTiny ];
meta = { meta = {
description = "Test PSGI programs using WWW::Mechanize"; description = "Test PSGI programs using WWW::Mechanize";