git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #50556 from oxij/pkgs/curl-cleanup

curl: move option defaults from `all-packages.nix` to the derivation itself

commit0925c482c8378e8a6a8724edc6596ea60f90a113 authorMatthew Bauer <mjbauer95@gmail.com> dateSun 18 Nov 2018, 18:25 (8 years ago) parent7f1943b50aef60
3 files changed+14−24
pkgs/tools/networking/curl/7_59.nix+7−7 pkgs/tools/networking/curl/default.nix+7−7 pkgs/top-level/all-packages.nix−10
pkgs/tools/networking/curl/7_59.nix+7−7
@@ -2,11 +2,11 @@
22, http2Support ? true, nghttp2
33, idnSupport ? false, libidn ? null
44, ldapSupport ? false, openldap ? null
5−, zlibSupport ? false, zlib ? null
6−, sslSupport ? false, openssl ? null
5+, zlibSupport ? true, zlib ? null
6+, sslSupport ? zlibSupport, openssl ? null
77, gnutlsSupport ? false, gnutls ? null
8−, scpSupport ? false, libssh2 ? null
9−, gssSupport ? false, kerberos ? null
8+, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null
9+, gssSupport ? !stdenv.hostPlatform.isWindows, libkrb5 ? null
1010, c-aresSupport ? false, c-ares ? null
1111, brotliSupport ? false, brotli ? null
1212}:
@@ -21,7 +21,7 @@ assert gnutlsSupport -> gnutls != null;
2121assert scpSupport -> libssh2 != null;
2222assert c-aresSupport -> c-ares != null;
2323assert brotliSupport -> brotli != null;
24−assert gssSupport -> kerberos != null;
24+assert gssSupport -> libkrb5 != null;
2525
2626stdenv.mkDerivation rec {
2727 name = "curl-7.59.0";
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
4949 optional idnSupport libidn ++
5050 optional ldapSupport openldap ++
5151 optional zlibSupport zlib ++
52− optional gssSupport kerberos ++
52+ optional gssSupport libkrb5 ++
5353 optional c-aresSupport c-ares ++
5454 optional sslSupport openssl ++
5555 optional gnutlsSupport gnutls ++
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
7474 ( if brotliSupport then "--with-brotli" else "--without-brotli" )
7575 ]
7676 ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
77− ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}"
77+ ++ stdenv.lib.optional gssSupport "--with-gssapi=${libkrb5.dev}"
7878 # For the 'urandom', maybe it should be a cross-system option
7979 ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
8080 "--with-random=/dev/urandom"
pkgs/tools/networking/curl/default.nix+7−7
@@ -2,11 +2,11 @@
22, http2Support ? true, nghttp2
33, idnSupport ? false, libidn ? null
44, ldapSupport ? false, openldap ? null
5−, zlibSupport ? false, zlib ? null
6−, sslSupport ? false, openssl ? null
5+, zlibSupport ? true, zlib ? null
6+, sslSupport ? zlibSupport, openssl ? null
77, gnutlsSupport ? false, gnutls ? null
8−, scpSupport ? false, libssh2 ? null
9−, gssSupport ? false, kerberos ? null
8+, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null
9+, gssSupport ? !stdenv.hostPlatform.isWindows, libkrb5 ? null
1010, c-aresSupport ? false, c-ares ? null
1111, brotliSupport ? false, brotli ? null
1212}:
@@ -21,7 +21,7 @@ assert gnutlsSupport -> gnutls != null;
2121assert scpSupport -> libssh2 != null;
2222assert c-aresSupport -> c-ares != null;
2323assert brotliSupport -> brotli != null;
24−assert gssSupport -> kerberos != null;
24+assert gssSupport -> libkrb5 != null;
2525
2626stdenv.mkDerivation rec {
2727 name = "curl-7.61.1";
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
4949 optional idnSupport libidn ++
5050 optional ldapSupport openldap ++
5151 optional zlibSupport zlib ++
52− optional gssSupport kerberos ++
52+ optional gssSupport libkrb5 ++
5353 optional c-aresSupport c-ares ++
5454 optional sslSupport openssl ++
5555 optional gnutlsSupport gnutls ++
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
7878 ( if brotliSupport then "--with-brotli" else "--without-brotli" )
7979 ]
8080 ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
81− ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}"
81+ ++ stdenv.lib.optional gssSupport "--with-gssapi=${libkrb5.dev}"
8282 # For the 'urandom', maybe it should be a cross-system option
8383 ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
8484 "--with-random=/dev/urandom"
pkgs/top-level/all-packages.nix−10
@@ -2128,20 +2128,10 @@ with pkgs;
21282128
21292129 curl_7_59 = callPackage ../tools/networking/curl/7_59.nix rec {
21302130 fetchurl = fetchurlBoot;
2131− http2Support = true;
2132− zlibSupport = true;
2133− sslSupport = zlibSupport;
2134− scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
2135− gssSupport = !stdenv.hostPlatform.isWindows;
21362131 };
21372132
21382133 curl = callPackage ../tools/networking/curl rec {
21392134 fetchurl = fetchurlBoot;
2140− http2Support = true;
2141− zlibSupport = true;
2142− sslSupport = zlibSupport;
2143− scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
2144− gssSupport = !stdenv.hostPlatform.isWindows;
21452135 };
21462136
21472137 curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { };