summaryrefslogtreecommitdiffstats
path: root/pkgs/development/interpreters/perl
diff options
context:
space:
mode:
authorStig Palmquist <stig@stig.io>2022-03-15 19:49:17 +0100
committerStig Palmquist <stig@stig.io>2022-03-16 17:00:24 +0100
commitd25a1e4e0febee463529d40b8c5b2112c6f059fc (patch)
treec9b26a3c2ae8932c8fbb36c8028fa013825af29a /pkgs/development/interpreters/perl
parentc8527aab06212b15819aeddc394afe72e9a744ab (diff)
perl.perl-cross: 393821c7 -> 1.3.7
- Update `perl-cross` to latest release which supports perl 5.34.1 - Remove patch as it's included upstream
Diffstat (limited to 'pkgs/development/interpreters/perl')
-rw-r--r--pkgs/development/interpreters/perl/default.nix15
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 7ee68bfdfdd1..d4a1d6877023 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
}:
@@ -40,14 +40,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.
@@ -193,14 +186,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 ];