From fdb9f10e4e63681e881597ffb99fc171d0a38407 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 20 Jul 2018 12:54:32 -0500 Subject: [PATCH 1/2] perl: 1.1.8 -> 1.2, fix w/newer perl --- pkgs/development/interpreters/perl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 4deadefcc4bc..dc1faf240f50 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -156,11 +156,11 @@ let platforms = platforms.all; }; } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.1.8"; + crossVersion = "1.2"; perl-cross-src = fetchurlBoot { url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz"; - sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8"; + sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r"; }; # https://github.com/arsv/perl-cross/issues/60 From 063132c22c937253a13ce52281a3a18ffcf73351 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 20 Jul 2018 12:56:07 -0500 Subject: [PATCH 2/2] perl-cross: remove patch that's now included --- pkgs/development/interpreters/perl/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index dc1faf240f50..08672d28a1f8 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -163,19 +163,10 @@ let sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r"; }; - # https://github.com/arsv/perl-cross/issues/60 - perl-cross-gcc7-patch = fetchpatch { - url = "https://github.com/arsv/perl-cross/commit/07208bc1707b8be3ea170c62c59120020cf0f87f.patch"; - sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810"; - }; - depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; postUnpack = '' unpackFile ${perl-cross-src} - cd perl-cross-* - patch -Np1 -i ${perl-cross-gcc7-patch} - cd .. cp -R perl-cross-${crossVersion}/* perl-${version}/ '';