diff options
| author | Lassulus <github@lassul.us> | 2022-04-08 17:56:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 17:56:55 +0100 |
| commit | 81dc2b51fddea29203095314c2d4b2f91526c5ae (patch) | |
| tree | d7198a38d8e7c8ec3338c084ba57d16fed8de9bf /pkgs/development/interpreters/perl | |
| parent | f4de52a156c0dc4bd540954c053892a3689a88a2 (diff) | |
| parent | 2cf99c997decee01ebf6e21d3081c15c3e3835d4 (diff) | |
Merge pull request #164301 from stigtsp/package/perl-5.34.1
perl: 5.34.0 -> 5.34.1, perldevel: 5.35.4 -> 5.35.9, perl.perl-cross: 393821c7 -> 1.3.7
Diffstat (limited to 'pkgs/development/interpreters/perl')
| -rw-r--r-- | pkgs/development/interpreters/perl/default.nix | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 81099b967452..9c3c34c73aad 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, pkgs, buildPackages +{ config, lib, stdenv, fetchurl, fetchFromGitHub, pkgs, buildPackages , callPackage , enableThreading ? true, coreutils, makeWrapper , zlib @@ -41,14 +41,7 @@ let ] ++ optional stdenv.isSunOS ./ld-shared.patch ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] - ++ optionals crossCompiling [ - ./MakeMaker-cross.patch - # https://github.com/arsv/perl-cross/pull/120 - (fetchpatch { - url = "https://github.com/arsv/perl-cross/commit/3c318ae6572f8b36cb077c8b49c851e2f5fe181e.patch"; - sha256 = "0cmcy8bams3c68f6xadl52z2w378wcpdjzi3qi4pcyvcfs011l6g"; - }) - ]; + ++ optional crossCompiling ./MakeMaker-cross.patch; # This is not done for native builds because pwd may need to come from # bootstrap tools when building bootstrap perl. @@ -204,14 +197,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 = "393821c7cf53774233aaf130ff2c8ccec701b0a9"; # Sep 22, 2021 + crossVersion = "1.3.7"; # Mar 15, 2022 perl-cross-src = fetchFromGitHub { name = "perl-cross-${crossVersion}"; owner = "arsv"; repo = "perl-cross"; rev = crossVersion; - sha256 = "1fn35b1773aibi2z54m0mar7114737mvfyp81wkdwhakrmzr5nv1"; + sha256 = "sha256-F7Vi3RAgIE/3NPlbD5zQ3Q8Ex9ddXTC4zoCRaOxXK0A="; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -240,15 +233,15 @@ in { perl534 = common { perl = pkgs.perl534; buildPerl = buildPackages.perl534; - version = "5.34.0"; - sha256 = "16mywn5afpv1mczv9dlc1w84rbgjgrr0pyr4c0hhb2wnif0zq7jm"; + version = "5.34.1"; + sha256 = "sha256-NXlRpJGwuhzjYRJjki/ux4zNWB3dwkpEawM+JazyQqE="; }; # the latest Devel version perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.35.4"; - sha256 = "1ss2r0qq5li6d2qghfv1iah5nl6nraymd7b7ib1iy1395rwyhl4q"; + version = "5.35.9"; + sha256 = "sha256-/nmSCIIXHXoC68DxFM9b5GM2AKU4WlLbfWLgduanL7U="; }; } |