Merge #246585: Fix perlPackages breakage

...into staging-next

+26
pkgs/development/perl-modules/Data-Clone-fix-apostrophe-package-separator.patch
···
+
https://github.com/gfx/p5-Data-Clone/pull/3
+
+
From 43102a83d15aedc61e5904eb5a6dab33c3c02b40 Mon Sep 17 00:00:00 2001
+
From: Yves Orton <demerphq@gmail.com>
+
Date: Thu, 9 Feb 2023 16:24:45 +0100
+
Subject: [PATCH] t/07_stack.t - isn't is deprecated, use isnt instead
+
+
As of 5.37.8 use of apostrophe for a package separator is deprecated,
+
and in 5.40 it will be removed entirely. Switch to isnt() instead
+
of isn't().
+
---
+
t/07_stack.t | 2 +-
+
1 file changed, 1 insertion(+), 1 deletion(-)
+
+
diff --git a/t/07_stack.t b/t/07_stack.t
+
index 165e6a5..a750366 100644
+
--- a/t/07_stack.t
+
+++ b/t/07_stack.t
+
@@ -17,6 +17,6 @@ use Data::Clone;
+
+
my $before = bless [], Bar::;
+
my $after = clone($before);
+
-isn't $after, $before, 'stack reallocation during callback';
+
+isnt $after, $before, 'stack reallocation during callback';
+
+
done_testing;
+20
pkgs/development/perl-modules/Exception-Base-remove-smartmatch-when-5.38.0.patch
···
+
smartmatch deprecated in perl-5.37.10
+
+
Patch by @pghmcfc from
+
https://github.com/dex4er/perl-Exception-Base/issues/5#issuecomment-1637075218
+
+
diff --git a/t/tlib/Exception/BaseTest.pm b/t/tlib/Exception/BaseTest.pm
+
index d590d12..e531ed7 100644
+
--- a/t/tlib/Exception/BaseTest.pm
+
+++ b/t/tlib/Exception/BaseTest.pm
+
@@ -569,8 +569,9 @@ sub test_overload {
+
$self->assert_matches(qr/String at /, $obj);
+
+
# smart matching for Perl 5.10
+
- if ($] >= 5.010) {
+
+ # Deprecation warning added in 5.37.10
+
+ if ($] >= 5.010 && $] < 5.037010) {
+
no if $] >= 5.018, warnings => 'experimental::smartmatch';
+
eval q{
+
$self->assert_num_equals(1, 'String' ~~ $obj);
+
+31
pkgs/development/perl-modules/ExtUtils-Constant-fix-indirect-method-call-in-test.patch
···
+
https://rt.cpan.org/Public/Bug/Display.html?id=132995
+
+
From 94b5fc74c3d7ed835e83bac40632962af32f5b30 Mon Sep 17 00:00:00 2001
+
From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= <ilmari@ilmari.org>
+
Date: Mon, 13 Jul 2020 22:08:45 +0100
+
Subject: [PATCH] Fix indirect method call in ExtUtils::Constant test
+
+
It puts both "use $];" and "bootstrap $package \$VERSION;" in the
+
generated test module, which is going to break if we ever remove
+
`indirect` from the current feature bundle.
+
+
Fix by making the method call direct instead.
+
---
+
t/Constant.t | 2 +-
+
1 file changed, 1 insertion(+), 1 deletion(-)
+
+
diff --git a/t/Constant.t b/t/Constant.t
+
index d6b45668da..526a32c779 100644
+
--- a/t/Constant.t
+
+++ b/t/Constant.t
+
@@ -435,7 +435,7 @@ EOT
+
print FH ");\n";
+
# Print the AUTOLOAD subroutine ExtUtils::Constant generated for us
+
print FH autoload ($package, $]);
+
- print FH "bootstrap $package \$VERSION;\n1;\n__END__\n";
+
+ print FH "$package->bootstrap(\$VERSION);\n1;\n__END__\n";
+
close FH or die "close $pm: $!\n";
+
+
################ test.pl
+
--
+
2.26.2
+30 -21
pkgs/top-level/perl-packages.nix
···
BerkeleyDB = buildPerlPackage {
pname = "BerkeleyDB";
-
version = "0.64";
+
version = "0.65";
src = fetchurl {
-
url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.64.tar.gz";
-
hash = "sha256-U1yF6FScGsQ6IBYP3ALwpABhQVb9dhV//yiqM/2jdEs=";
+
url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.65.tar.gz";
+
hash = "sha256-QQqonnIylB1JEGyeBI1jN0dVQ+wdIz6nzbcly1uWNQQ=i";
};
preConfigure = ''
···
CryptX = buildPerlPackage {
pname = "CryptX";
-
version = "0.076";
+
version = "0.078";
src = fetchurl {
-
url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.076.tar.gz";
-
hash = "sha256-u4SsASQ4x87NtRpab/+08f7jsOrgAi6WzrwuFnUiYhw=";
+
url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.078.tar.gz";
+
hash = "sha256-kxYLEkL31XQ8s8kxuO/HyzmCHQ4y+U+Wkz8eiOYYvL0=";
};
meta = {
description = "Cryptographic toolkit";
···
hash = "sha256-L+XheYgqa5Jt/vChCLSiyHof+waJK88vuI5Mj0uEODw=";
};
buildInputs = [ TestRequires ];
+
patches = [
+
../development/perl-modules/Data-Clone-fix-apostrophe-package-separator.patch
+
];
meta = {
description = "Polymorphic data cloning";
license = with lib.licenses; [ artistic1 gpl1Plus ];
···
DevelCaller = buildPerlPackage {
pname = "Devel-Caller";
-
version = "2.06";
+
version = "2.07";
src = fetchurl {
-
url = "mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.06.tar.gz";
-
hash = "sha256-anOuaikoNCVbkNqUCSBUJTBfz+mUsUjcttLW72KNt98=";
+
url = "mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.07.tar.gz";
+
hash = "sha256-tnmisYA0sLcg3oLDcIckw2SxCmyhZMvGfNw68oPzUD8=";
};
propagatedBuildInputs = [ PadWalker ];
meta = {
···
DevelFindPerl = buildPerlPackage {
pname = "Devel-FindPerl";
-
version = "0.015";
+
version = "0.016";
src = fetchurl {
-
url = "mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.015.tar.gz";
-
hash = "sha256-UnW33CJv5/Fstp/G+Z9eKahSxqTTt4arGIajE4Z0Pfw=";
+
url = "mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.016.tar.gz";
+
hash = "sha256-Q6K/L3h6PxuIEXkGMWKyqj58sET25eduxkZq6QqGETg=";
};
meta = {
description = "Find the path to your perl";
···
DevelNYTProf = buildPerlPackage {
pname = "Devel-NYTProf";
-
version = "6.10";
+
version = "6.12";
src = fetchurl {
-
url = "mirror://cpan/authors/id/J/JK/JKEENAN/Devel-NYTProf-6.10.tar.gz";
-
hash = "sha256-JKxBdPHwEyIGP6ThGbJH03HTJg3cpud4xsGg4/kF9Y4=";
+
url = "mirror://cpan/authors/id/J/JK/JKEENAN/Devel-NYTProf-6.12.tar.gz";
+
hash = "sha256-qDtZheTalr24X1McFqtvPUkHGnM80JSqMPqF+2pLAsQ=";
};
propagatedBuildInputs = [ FileWhich JSONMaybeXS ];
buildInputs = [ CaptureTiny TestDifferences ];
···
hash = "sha256-VyPdePSsC00mKgXqRq9mPqANgJay6cCkNRXCEHYOHnU=";
};
buildInputs = [ TestUnitLite ];
+
patches = [
+
../development/perl-modules/Exception-Base-remove-smartmatch-when-5.38.0.patch
+
];
meta = {
description = "Lightweight exceptions";
license = with lib.licenses; [ artistic1 gpl1Plus ];
···
url = "mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.25.tar.gz";
hash = "sha256-aTPQ6WO2IoHvdWEGjmrsrIxKwrR2srugmrC5D7rJ11c=";
};
+
patches = [
+
../development/perl-modules/ExtUtils-Constant-fix-indirect-method-call-in-test.patch
+
];
meta = {
description = "Generate XS code to import C header constants";
license = with lib.licenses; [ artistic1 gpl1Plus ];
···
HTMLMason = buildPerlPackage {
pname = "HTML-Mason";
-
version = "1.59";
+
version = "1.60";
src = fetchurl {
-
url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.59.tar.gz";
-
hash = "sha256-lb7SpsSINwBGqjFL5LWSvWWmUi+IRdqLNqav+ai0OdA=";
+
url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.60.tar.gz";
+
hash = "sha256-qgu9WmtjxiyJVfjFXsCF43DXktZSZrbDtcXweIu8d+Y=";
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ CGI CacheCache ClassContainer ExceptionClass LogAny ];
···
LogLog4perl = buildPerlPackage {
pname = "Log-Log4perl";
-
version = "1.53";
+
version = "1.57";
src = fetchurl {
-
url = "mirror://cpan/authors/id/E/ET/ETJ/Log-Log4perl-1.53.tar.gz";
-
hash = "sha256-j7+0jQFu7HNEpTnzrXCHC0rEY45JZmv6cNEPb/1Kw44=";
+
url = "mirror://cpan/authors/id/E/ET/ETJ/Log-Log4perl-1.57.tar.gz";
+
hash = "sha256-D4/Ldjio89tMeX35T9vFYBN0kULy+Uy8lbQ8n8oJahM=";
meta = {
description = "Log4j implementation for Perl";