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: ae024556c9a8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e8c84d3449c1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 25, 2019

  1. fetchurl: use fetchurlBoot for zlib deps

    @dylex
    dylex committed Mar 25, 2019
    Copy the full SHA
    1c3a4ef View commit details

Commits on Mar 26, 2019

  1. Merge pull request #58283 from dylex/bootzlib 

    fetchurl: use fetchurlBoot for zlib deps
    @matthewbauer
    matthewbauer authored Mar 26, 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
    e8c84d3 View commit details
Showing with 4 additions and 2 deletions.
  1. +1 −0 pkgs/tools/networking/curl/default.nix
  2. +3 −2 pkgs/top-level/all-packages.nix
1 change: 1 addition & 0 deletions pkgs/tools/networking/curl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -94,6 +94,7 @@ stdenv.mkDerivation rec {

postInstall = ''
moveToOutput bin/curl-config "$dev"
'' + stdenv.lib.optionalString scpSupport ''
sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
'' + stdenv.lib.optionalString gnutlsSupport ''
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so
5 changes: 3 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -256,6 +256,7 @@ in
curl = buildPackages.curl.override rec {
# break dependency cycles
fetchurl = stdenv.fetchurlBoot;
zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; };
pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; };
perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
openssl = buildPackages.openssl.override {
@@ -265,7 +266,7 @@ in
};
libssh2 = buildPackages.libssh2.override {
fetchurl = stdenv.fetchurlBoot;
inherit openssl;
inherit zlib openssl;
};
# On darwin, libkrb5 needs bootstrap_cmds which would require
# converting many packages to fetchurl_boot to avoid evaluation cycles.
@@ -277,7 +278,7 @@ in
};
nghttp2 = buildPackages.nghttp2.override {
fetchurl = stdenv.fetchurlBoot;
inherit pkgconfig openssl;
inherit zlib pkgconfig openssl;
c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; };
libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; };
};