Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 95039d066841
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a059fc742022
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Feb 19, 2019

  1. 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).
    @oxij
    oxij committed Feb 19, 2019
    Copy the full SHA
    a1fec86 View commit details

Commits on Feb 21, 2019

  1. Merge pull request #56067 from oxij/tree/fetchurl-boot 

    treewide: assemble all `fetchurlBoot` uses in overrides to `fetchurl`
    @7c6f434c
    7c6f434c authored Feb 21, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a059fc7 View commit details
8 changes: 4 additions & 4 deletions pkgs/development/interpreters/perl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
};
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libssh2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
};
4 changes: 2 additions & 2 deletions pkgs/os-specific/darwin/apple-source-releases/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildPackages, fetchurl, fetchzip, pkgs, fetchurlBoot }:
{ stdenv, buildPackages, fetchurl, fetchzip, pkgs }:

let
# This attrset can in theory be computed automatically, but for that to work nicely we need
@@ -141,7 +141,7 @@ let
# in an infinite recursion without this. It's not clear why this
# worked fine when not cross-compiling
fetch = if name == "libiconv"
then fetchurlBoot
then stdenv.fetchurlBoot
else fetchurl;
in fetch {
url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${versions.${version}.${name}}.tar.gz";
79 changes: 39 additions & 40 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -237,9 +237,35 @@ in
# `fetchurl' downloads a file from the network.
fetchurl = import ../build-support/fetchurl {
inherit lib stdenvNoCC;
# On darwin, libkrb5 needs bootstrap_cmds which would require
# converting many packages to fetchurl_boot to avoid evaluation cycles.
curl = buildPackages.curl.override (lib.optionalAttrs stdenv.isDarwin { gssSupport = false; });
curl = buildPackages.curl.override rec {
# break dependency cycles
fetchurl = stdenv.fetchurlBoot;
pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; };
perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
openssl = buildPackages.openssl.override {
fetchurl = stdenv.fetchurlBoot;
inherit perl;
buildPackages = { inherit perl; };
};
libssh2 = buildPackages.libssh2.override {
fetchurl = stdenv.fetchurlBoot;
inherit openssl;
};
# On darwin, libkrb5 needs bootstrap_cmds which would require
# converting many packages to fetchurl_boot to avoid evaluation cycles.
gssSupport = !stdenv.isDarwin && !stdenv.hostPlatform.isWindows;
libkrb5 = buildPackages.libkrb5.override {
fetchurl = stdenv.fetchurlBoot;
inherit pkgconfig perl openssl;
keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; };
};
nghttp2 = buildPackages.nghttp2.override {
fetchurl = stdenv.fetchurlBoot;
inherit pkgconfig openssl;
c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; };
libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; };
};
};
};

fetchRepoProject = callPackage ../build-support/fetchrepoproject { };
@@ -248,13 +274,6 @@ in
inherit curl stdenv;
};

# fetchurlBoot is used for curl and its dependencies in order to
# prevent a cyclic dependency (curl depends on curl.tar.bz2,
# curl.tar.bz2 depends on fetchurl, fetchurl depends on curl). It
# uses the curl from the previous bootstrap phase (e.g. a statically
# linked curl in the case of stdenv-linux).
fetchurlBoot = stdenv.fetchurlBoot;

fetchzip = callPackage ../build-support/fetchzip { };

fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { };
@@ -2135,9 +2154,7 @@ in
brotliSupport = true;
};

curl = callPackage ../tools/networking/curl rec {
fetchurl = fetchurlBoot;
};
curl = callPackage ../tools/networking/curl { };

curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { };

@@ -8967,9 +8984,7 @@ in

pkgconf = callPackage ../development/tools/misc/pkgconf {};

pkg-config = callPackage ../development/tools/misc/pkg-config {
fetchurl = fetchurlBoot;
};
pkg-config = callPackage ../development/tools/misc/pkg-config { };
pkgconfig = pkg-config; # added 2018-02-02

pkg-configUpstream = lowPrio (pkg-config.override { vanilla = true; });
@@ -9434,9 +9449,7 @@ in

bzrtp = callPackage ../development/libraries/bzrtp { };

c-ares = callPackage ../development/libraries/c-ares {
fetchurl = fetchurlBoot;
};
c-ares = callPackage ../development/libraries/c-ares { };

c-blosc = callPackage ../development/libraries/c-blosc { };

@@ -10484,10 +10497,7 @@ in
inherit (buildPackages.darwin) bootstrap_cmds;
};
krb5Full = krb5;
libkrb5 = krb5.override {
fetchurl = fetchurlBoot;
type = "lib";
};
libkrb5 = krb5.override { type = "lib"; };
kerberos = libkrb5; # TODO: move to aliases.nix

languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; });
@@ -10863,9 +10873,7 @@ in

libechonest = callPackage ../development/libraries/libechonest { };

libev = callPackage ../development/libraries/libev {
fetchurl = fetchurlBoot;
};
libev = callPackage ../development/libraries/libev { };

libevent = callPackage ../development/libraries/libevent { };

@@ -11083,9 +11091,7 @@ in
ln -sv ${libcDev}/include/iconv.h $out/include
'';

libiconvReal = callPackage ../development/libraries/libiconv {
fetchurl = fetchurlBoot;
};
libiconvReal = callPackage ../development/libraries/libiconv { };

# On non-GNU systems we need GNU Gettext for libintl.
libintl = if stdenv.hostPlatform.libc != "glibc" then gettext else null;
@@ -11755,9 +11761,7 @@ in

newt = callPackage ../development/libraries/newt { };

nghttp2 = callPackage ../development/libraries/nghttp2 {
fetchurl = fetchurlBoot;
};
nghttp2 = callPackage ../development/libraries/nghttp2 { };
libnghttp2 = nghttp2.lib;

nix-plugins = callPackage ../development/libraries/nix-plugins {
@@ -11913,9 +11917,7 @@ in

openssl = openssl_1_0_2;

inherit (callPackages ../development/libraries/openssl {
fetchurl = fetchurlBoot;
})
inherit (callPackages ../development/libraries/openssl { })
openssl_1_0_2
openssl_1_1;

@@ -13110,9 +13112,7 @@ in

zeitgeist = callPackage ../development/libraries/zeitgeist { };

zlib = callPackage ../development/libraries/zlib {
fetchurl = fetchurlBoot;
};
zlib = callPackage ../development/libraries/zlib { };

libdynd = callPackage ../development/libraries/libdynd { };

@@ -14888,8 +14888,7 @@ in
kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod
};

# Using fetchurlBoot because this is used by kerberos (on Linux), which curl depends on
keyutils = callPackage ../os-specific/linux/keyutils { fetchurl = fetchurlBoot; };
keyutils = callPackage ../os-specific/linux/keyutils { };

libselinux = callPackage ../os-specific/linux/libselinux { };