From 20868cb2d07dffa645e736d676a1e8df3e082284 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 4 Jun 2022 19:39:39 +0200 Subject: [PATCH 1/5] perl: 5.34.1 -> 5.36.0 - perl536: init at 5.36.0 - perl: perl534 -> perl536 - perlPackages: perl534Packages -> perl536Packages - perl532: remove --- pkgs/development/interpreters/perl/default.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index f14c69811430..21fc51cdc585 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -222,14 +222,6 @@ let setupHook = ./setup-hook-cross.sh; }); in { - # Maint version - perl532 = common { - perl = pkgs.perl532; - buildPerl = buildPackages.perl532; - version = "5.32.1"; - sha256 = "0b7brakq9xs4vavhg391as50nbhzryc7fy5i65r81bnq3j897dh3"; - }; - # Maint version perl534 = common { perl = pkgs.perl534; @@ -238,6 +230,14 @@ in { sha256 = "sha256-NXlRpJGwuhzjYRJjki/ux4zNWB3dwkpEawM+JazyQqE="; }; + # Maint version + perl536 = common { + perl = pkgs.perl536; + buildPerl = buildPackages.perl536; + version = "5.36.0"; + sha256 = "sha256-4mCFr4rDlvYq3YpTPDoOqMhJfYNvBok0esWr17ek4Ao="; + }; + # the latest Devel version perldevel = common { perl = pkgs.perldevel; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb8fffa9bddc..f8c45e6636f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21976,14 +21976,14 @@ with pkgs; ### DEVELOPMENT / PERL MODULES perlInterpreters = callPackages ../development/interpreters/perl {}; - inherit (perlInterpreters) perl532 perl534 perldevel; + inherit (perlInterpreters) perl534 perl536 perldevel; - perl532Packages = recurseIntoAttrs perl532.pkgs; perl534Packages = recurseIntoAttrs perl534.pkgs; + perl536Packages = recurseIntoAttrs perl536.pkgs; perldevelPackages = perldevel.pkgs; - perl = perl534; - perlPackages = perl534Packages; + perl = perl536; + perlPackages = perl536Packages; ack = perlPackages.ack; From aea35e23d218e03547490d88d378c18df7d4eba6 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 5 Jun 2022 01:21:48 +0200 Subject: [PATCH 2/5] unit: add perl536 as default, remove perl532 --- pkgs/servers/http/unit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 3483623db2e3..c1174383c95f 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -3,8 +3,8 @@ , withPython3 ? true, python3, ncurses , withPHP80 ? false, php80 , withPHP81 ? true, php81 -, withPerl532 ? false, perl532 -, withPerl534 ? true, perl534 +, withPerl534 ? false, perl534 +, withPerl536 ? true, perl536 , withPerldevel ? false, perldevel , withRuby_2_7 ? true, ruby_2_7 , withRuby_3_0 ? false, ruby_3_0 @@ -46,8 +46,8 @@ in stdenv.mkDerivation rec { ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP80 php80-unit ++ optional withPHP81 php81-unit - ++ optional withPerl532 perl532 ++ optional withPerl534 perl534 + ++ optional withPerl536 perl536 ++ optional withPerldevel perldevel ++ optional withRuby_2_7 ruby_2_7 ++ optional withRuby_3_0 ruby_3_0 @@ -71,8 +71,8 @@ in stdenv.mkDerivation rec { ${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} ${optionalString withPHP80 "./configure php --module=php80 --config=${php80-unit.unwrapped.dev}/bin/php-config --lib-path=${php80-unit}/lib"} ${optionalString withPHP81 "./configure php --module=php81 --config=${php81-unit.unwrapped.dev}/bin/php-config --lib-path=${php81-unit}/lib"} - ${optionalString withPerl532 "./configure perl --module=perl532 --perl=${perl532}/bin/perl"} ${optionalString withPerl534 "./configure perl --module=perl534 --perl=${perl534}/bin/perl"} + ${optionalString withPerl536 "./configure perl --module=perl536 --perl=${perl536}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} ${optionalString withRuby_2_7 "./configure ruby --module=ruby27 --ruby=${ruby_2_7}/bin/ruby"} ${optionalString withRuby_3_0 "./configure ruby --module=ruby30 --ruby=${ruby_3_0}/bin/ruby"} From 5e2471dfecfcc797a0385672c9f2a5b95e2c5716 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 5 Jun 2022 00:48:19 +0200 Subject: [PATCH 3/5] perldevel: 5.35.9 -> 5.37.0, perl-cross: 31dac3e2 -> c8760457 --- pkgs/development/interpreters/perl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 21fc51cdc585..0a9c53e11c5f 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -198,14 +198,14 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "31dac3e264a7f1f53dbf49570771123ebd514055"; # May 03, 2022 + crossVersion = "c876045741f5159318085d2737b0090f35a842ca"; # June 5, 2022 perl-cross-src = fetchFromGitHub { name = "perl-cross-unstable-${crossVersion}"; owner = "arsv"; repo = "perl-cross"; rev = crossVersion; - sha256 = "sha256-5hLUP34WwTFRsG0o8zSJm8WM3WfBAhHeYrrQF2MtMKc="; + sha256 = "sha256-m9UCoTQgXBxSgk9Q1Zv6wl3Qnd0aZm/jEPXkcMKti8U="; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -242,7 +242,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.35.9"; - sha256 = "sha256-/nmSCIIXHXoC68DxFM9b5GM2AKU4WlLbfWLgduanL7U="; + version = "5.37.0"; + sha256 = "sha256-8RQO6gtH+WmghqzRafbqAH1MhKv/vJCcvysi7/+T9XI="; }; } From 36eea7e9301dbc6f62302d8e76b3e4e2ddac98fa Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 2 Aug 2022 01:54:44 +0200 Subject: [PATCH 4/5] perlPackages.BKeywords: 1.22 -> 1.24 --- 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 f16bce06cea6..04aeb2c5f3f1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1533,10 +1533,10 @@ let BKeywords = buildPerlPackage rec { pname = "B-Keywords"; - version = "1.22"; + version = "1.24"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-${version}.tar.gz"; - sha256 = "0i2ksp0w9wv1qc22hrdl3k48cww64syhmv8zf6x0kgyd4081hr56"; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.24.tar.gz"; + sha256 = "sha256-pc9rsoXQbRfO4id4O3I7snQhP9QVOl3uMR0kDhFpYG4="; }; meta = { description = "Lists of reserved barewords and symbol names"; From a57fef4702c564d82263801c022bfa6e8cee9395 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 2 Aug 2022 02:07:35 +0200 Subject: [PATCH 5/5] perlPackages.DBIxClass: 0.082842 -> 0.082843 --- pkgs/top-level/perl-packages.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 04aeb2c5f3f1..803978dc0e64 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6420,18 +6420,11 @@ let DBIxClass = buildPerlPackage { pname = "DBIx-Class"; - version = "0.082842"; + version = "0.082843"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.082842.tar.gz"; - sha256 = "1rh7idjjbibc1zmiaaarask434lh0lx7f2xyfwmy37k9fa0xcpmh"; + url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.082843.tar.gz"; + sha256 = "sha256-NB4Lbssp2MSRdKbAnXxtvzhym6QBXuf9cDYKT/7h8lE="; }; - patches = [ - # https://github.com/Perl5/DBIx-Class/pull/141 - (fetchpatch { - url = "https://github.com/Perl5/DBIx-Class/commit/fb896701d23fa4da622b5b1b2afbbba3da2dd8f3.patch"; - sha256 = "sha256-MSbV9UfHu90NCdC5IFwuy/vpSDw4atfellYh7Ydvkm4="; - }) - ]; buildInputs = [ DBDSQLite TestDeep TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction ModuleFind PathClass SQLAbstractClassic ScopeGuard SubName namespaceclean ]; meta = {