diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-19 09:55:32 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-19 09:55:32 +0100 |
commit | e343a85cfb67ebaabd507359128c908254ee329a (patch) | |
tree | 41639c511e90c79bb0aaf2fa63904f33a325b947 /pkgs/tools/networking/curl | |
parent | 5f575e7339eeea6b58e8566357cc580713e0a30d (diff) | |
parent | c4cad8cfa7ba1c66199e064c93fe3525e919cb82 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking/curl')
-rw-r--r-- | pkgs/tools/networking/curl/7_59.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/tools/networking/curl/7_59.nix b/pkgs/tools/networking/curl/7_59.nix index 508b357e3fdeb..272c38a995867 100644 --- a/pkgs/tools/networking/curl/7_59.nix +++ b/pkgs/tools/networking/curl/7_59.nix @@ -2,11 +2,11 @@ , http2Support ? true, nghttp2 , idnSupport ? false, libidn ? null , ldapSupport ? false, openldap ? null -, zlibSupport ? false, zlib ? null -, sslSupport ? false, openssl ? null +, zlibSupport ? true, zlib ? null +, sslSupport ? zlibSupport, openssl ? null , gnutlsSupport ? false, gnutls ? null -, scpSupport ? false, libssh2 ? null -, gssSupport ? false, kerberos ? null +, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null +, gssSupport ? !stdenv.hostPlatform.isWindows, libkrb5 ? null , c-aresSupport ? false, c-ares ? null , brotliSupport ? false, brotli ? null }: @@ -21,7 +21,7 @@ assert gnutlsSupport -> gnutls != null; assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; assert brotliSupport -> brotli != null; -assert gssSupport -> kerberos != null; +assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { name = "curl-7.59.0"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { optional idnSupport libidn ++ optional ldapSupport openldap ++ optional zlibSupport zlib ++ - optional gssSupport kerberos ++ + optional gssSupport libkrb5 ++ optional c-aresSupport c-ares ++ optional sslSupport openssl ++ optional gnutlsSupport gnutls ++ @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ( if brotliSupport then "--with-brotli" else "--without-brotli" ) ] ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" - ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}" + ++ stdenv.lib.optional gssSupport "--with-gssapi=${libkrb5.dev}" # For the 'urandom', maybe it should be a cross-system option ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-random=/dev/urandom" diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index c362f9fcf2e4d..dac92f98223c3 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -2,11 +2,11 @@ , http2Support ? true, nghttp2 , idnSupport ? false, libidn ? null , ldapSupport ? false, openldap ? null -, zlibSupport ? false, zlib ? null -, sslSupport ? false, openssl ? null +, zlibSupport ? true, zlib ? null +, sslSupport ? zlibSupport, openssl ? null , gnutlsSupport ? false, gnutls ? null -, scpSupport ? false, libssh2 ? null -, gssSupport ? false, kerberos ? null +, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null +, gssSupport ? !stdenv.hostPlatform.isWindows, libkrb5 ? null , c-aresSupport ? false, c-ares ? null , brotliSupport ? false, brotli ? null }: @@ -21,7 +21,7 @@ assert gnutlsSupport -> gnutls != null; assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; assert brotliSupport -> brotli != null; -assert gssSupport -> kerberos != null; +assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { name = "curl-7.62.0"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { optional idnSupport libidn ++ optional ldapSupport openldap ++ optional zlibSupport zlib ++ - optional gssSupport kerberos ++ + optional gssSupport libkrb5 ++ optional c-aresSupport c-ares ++ optional sslSupport openssl ++ optional gnutlsSupport gnutls ++ @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ( if brotliSupport then "--with-brotli" else "--without-brotli" ) ] ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" - ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}" + ++ stdenv.lib.optional gssSupport "--with-gssapi=${libkrb5.dev}" # For the 'urandom', maybe it should be a cross-system option ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-random=/dev/urandom" |