diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-11-17 17:23:24 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-19 20:55:59 +0000 |
commit | a1fec8667dceac682f4cd5deeb9dff28fcee5e37 (patch) | |
tree | 521418c0a04f11adb679de7c7883203af728ed8d /pkgs/development | |
parent | 7226ab90843f8cb366f0e6f90ba16e8214e19bdb (diff) |
treewide: assemble all `fetchurlBoot` uses in overrides to `fetchurl` itself
The only outside-curl uses of `fetchurlBoot` left are `stdenv`
and `apple-source-releases`. The latter one can probably be removed
too, but I can't test it.
Pros:
- Aggregates all behind-the-scenes insanity in a single place.
Cons:
- At the cost of 10 more derivations (but 0 new outpaths).
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 5e8f5e2d59b6..40e6663407bd 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"; }) @@ -156,7 +156,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 b050dede8c61..0986dee0ca0d 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"; }; |