From 1439845fed0c8d595af808d32d7f9b9e014b4f62 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 Apr 2021 18:11:37 +0000 Subject: [PATCH 1/3] perl.perl-cross-src: use fetchFromGitHub --- pkgs/development/interpreters/perl/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 01b3e995f5e4..847200e400e6 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,5 @@ -{ config, lib, stdenv, fetchurl, pkgs, buildPackages, callPackage +{ config, lib, stdenv, fetchurl, fetchFromGitHub, pkgs, buildPackages +, callPackage , enableThreading ? true, coreutils, makeWrapper }: @@ -173,16 +174,20 @@ let } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { crossVersion = "e53999d0c340769792ba18d749751b0df3d1d177"; # Mar 21, 2021 - perl-cross-src = fetchurl { - url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "14vcpwjhq667yh0cs7ism70df8l7068vn4a0ww59hdjyj7yc84i6"; + perl-cross-src = fetchFromGitHub { + name = "perl-cross-${crossVersion}"; + owner = "arsv"; + repo = "perl-cross"; + rev = crossVersion; + sha256 = "1kw5xjv6pvkrrcycl6aiqx4zaas1w3652hgd3907q67pcrc4mmdm"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; postUnpack = '' unpackFile ${perl-cross-src} - cp -R perl-cross-${crossVersion}/* perl-${version}/ + chmod -R u+w ${perl-cross-src.name} + cp -R ${perl-cross-src.name}/* perl-${version}/ ''; configurePlatforms = [ "build" "host" "target" ]; From d5607f05aff9bf13d85491943ad6eb85c11acd0e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 Apr 2021 18:18:37 +0000 Subject: [PATCH 2/3] perl.perl-cross-src: 2021-03-21 -> 1.3.6 New version adds support for NetBSD (by me!). --- 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 847200e400e6..ad369956745a 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -172,14 +172,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 = "e53999d0c340769792ba18d749751b0df3d1d177"; # Mar 21, 2021 + crossVersion = "1.3.6"; perl-cross-src = fetchFromGitHub { name = "perl-cross-${crossVersion}"; owner = "arsv"; repo = "perl-cross"; rev = crossVersion; - sha256 = "1kw5xjv6pvkrrcycl6aiqx4zaas1w3652hgd3907q67pcrc4mmdm"; + sha256 = "0k5vyj40czbkfl7r3dcwxpc7dvdlp2xliaav358bviq3dq9vq9bb"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; From 71c1bf81e25243b53ddc2b7db6dde34296712998 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 3 Jun 2021 13:23:01 +0000 Subject: [PATCH 3/3] perldevel: 5.33.8 -> 5.35.0 --- 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 ad369956745a..5c75894c4f7e 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -216,7 +216,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.33.8"; - sha256 = "1zr6sdsfcmk86n3f8j65x07xkv29v0pi8bwc986ahmjx7x92xzgl"; + version = "5.35.0"; + sha256 = "0217nbswhkjhw60kng2p64611xna7za681kk30fkriyicd3yph6n"; }; }