diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2019-02-21 09:43:11 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-21 09:43:11 +0000 |
commit | a059fc7420225772b848d09157e7de2458722192 (patch) | |
tree | a97267f6fc925d44a5019a21ebdb381f3a4643e2 /pkgs/development | |
parent | 95039d066841691e56bbd8db2c4e61b7f86c37a6 (diff) | |
parent | a1fec8667dceac682f4cd5deeb9dff28fcee5e37 (diff) | |
download | nixpkgs-a059fc7420225772b848d09157e7de2458722192.tar nixpkgs-a059fc7420225772b848d09157e7de2458722192.tar.gz nixpkgs-a059fc7420225772b848d09157e7de2458722192.tar.bz2 nixpkgs-a059fc7420225772b848d09157e7de2458722192.tar.lz nixpkgs-a059fc7420225772b848d09157e7de2458722192.tar.xz nixpkgs-a059fc7420225772b848d09157e7de2458722192.tar.zst nixpkgs-a059fc7420225772b848d09157e7de2458722192.zip |
Merge pull request #56067 from oxij/tree/fetchurl-boot
treewide: assemble all `fetchurlBoot` uses in overrides to `fetchurl`
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/perl/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/libssh2/default.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index ecec2f11fc8..f6990fd29d0 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurlBoot, buildPackages +{ lib, stdenv, fetchurl, buildPackages , enableThreading ? stdenv ? glibc, makeWrapper }: @@ -27,7 +27,7 @@ let name = "perl-${version}"; - src = fetchurlBoot { + src = fetchurl { url = "mirror://cpan/src/5.0/${name}.tar.gz"; inherit sha256; }; @@ -46,7 +46,7 @@ let ] ++ optional (versionOlder version "5.29.6") # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360 - (fetchurlBoot { + (fetchurl { url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch"; sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0"; }) @@ -159,7 +159,7 @@ let } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { crossVersion = "276849e62f472c1b241d9e7b38a28e4cc9f98563"; # Dez 02, 2018 - perl-cross-src = fetchurlBoot { + perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; sha256 = "1fpr1m9lgkwdp1vmdr0s6gvmcpd0m8q6jwn024bkczc2h37bdynd"; }; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index b050dede8c6..0986dee0ca0 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurlBoot, openssl, zlib, windows }: +{ stdenv, fetchurl, openssl, zlib, windows }: stdenv.mkDerivation rec { name = "libssh2-1.8.0"; - src = fetchurlBoot { + src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; sha256 = "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr"; }; |