mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 14:41:27 +00:00
Merge pull request #50556 from oxij/pkgs/curl-cleanup
curl: move option defaults from `all-packages.nix` to the derivation itself
This commit is contained in:
commit
0925c482c8
@ -2,11 +2,11 @@
|
|||||||
, http2Support ? true, nghttp2
|
, http2Support ? true, nghttp2
|
||||||
, idnSupport ? false, libidn ? null
|
, idnSupport ? false, libidn ? null
|
||||||
, ldapSupport ? false, openldap ? null
|
, ldapSupport ? false, openldap ? null
|
||||||
, zlibSupport ? false, zlib ? null
|
, zlibSupport ? true, zlib ? null
|
||||||
, sslSupport ? false, openssl ? null
|
, sslSupport ? zlibSupport, openssl ? null
|
||||||
, gnutlsSupport ? false, gnutls ? null
|
, gnutlsSupport ? false, gnutls ? null
|
||||||
, scpSupport ? false, libssh2 ? null
|
, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null
|
||||||
, gssSupport ? false, kerberos ? null
|
, gssSupport ? !stdenv.hostPlatform.isWindows, libkrb5 ? null
|
||||||
, c-aresSupport ? false, c-ares ? null
|
, c-aresSupport ? false, c-ares ? null
|
||||||
, brotliSupport ? false, brotli ? null
|
, brotliSupport ? false, brotli ? null
|
||||||
}:
|
}:
|
||||||
@ -21,7 +21,7 @@ assert gnutlsSupport -> gnutls != null;
|
|||||||
assert scpSupport -> libssh2 != null;
|
assert scpSupport -> libssh2 != null;
|
||||||
assert c-aresSupport -> c-ares != null;
|
assert c-aresSupport -> c-ares != null;
|
||||||
assert brotliSupport -> brotli != null;
|
assert brotliSupport -> brotli != null;
|
||||||
assert gssSupport -> kerberos != null;
|
assert gssSupport -> libkrb5 != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "curl-7.59.0";
|
name = "curl-7.59.0";
|
||||||
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||||||
optional idnSupport libidn ++
|
optional idnSupport libidn ++
|
||||||
optional ldapSupport openldap ++
|
optional ldapSupport openldap ++
|
||||||
optional zlibSupport zlib ++
|
optional zlibSupport zlib ++
|
||||||
optional gssSupport kerberos ++
|
optional gssSupport libkrb5 ++
|
||||||
optional c-aresSupport c-ares ++
|
optional c-aresSupport c-ares ++
|
||||||
optional sslSupport openssl ++
|
optional sslSupport openssl ++
|
||||||
optional gnutlsSupport gnutls ++
|
optional gnutlsSupport gnutls ++
|
||||||
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
|||||||
( if brotliSupport then "--with-brotli" else "--without-brotli" )
|
( if brotliSupport then "--with-brotli" else "--without-brotli" )
|
||||||
]
|
]
|
||||||
++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
|
++ 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
|
# For the 'urandom', maybe it should be a cross-system option
|
||||||
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||||
"--with-random=/dev/urandom"
|
"--with-random=/dev/urandom"
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
, http2Support ? true, nghttp2
|
, http2Support ? true, nghttp2
|
||||||
, idnSupport ? false, libidn ? null
|
, idnSupport ? false, libidn ? null
|
||||||
, ldapSupport ? false, openldap ? null
|
, ldapSupport ? false, openldap ? null
|
||||||
, zlibSupport ? false, zlib ? null
|
, zlibSupport ? true, zlib ? null
|
||||||
, sslSupport ? false, openssl ? null
|
, sslSupport ? zlibSupport, openssl ? null
|
||||||
, gnutlsSupport ? false, gnutls ? null
|
, gnutlsSupport ? false, gnutls ? null
|
||||||
, scpSupport ? false, libssh2 ? null
|
, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null
|
||||||
, gssSupport ? false, kerberos ? null
|
, gssSupport ? !stdenv.hostPlatform.isWindows, libkrb5 ? null
|
||||||
, c-aresSupport ? false, c-ares ? null
|
, c-aresSupport ? false, c-ares ? null
|
||||||
, brotliSupport ? false, brotli ? null
|
, brotliSupport ? false, brotli ? null
|
||||||
}:
|
}:
|
||||||
@ -21,7 +21,7 @@ assert gnutlsSupport -> gnutls != null;
|
|||||||
assert scpSupport -> libssh2 != null;
|
assert scpSupport -> libssh2 != null;
|
||||||
assert c-aresSupport -> c-ares != null;
|
assert c-aresSupport -> c-ares != null;
|
||||||
assert brotliSupport -> brotli != null;
|
assert brotliSupport -> brotli != null;
|
||||||
assert gssSupport -> kerberos != null;
|
assert gssSupport -> libkrb5 != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "curl-7.61.1";
|
name = "curl-7.61.1";
|
||||||
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||||||
optional idnSupport libidn ++
|
optional idnSupport libidn ++
|
||||||
optional ldapSupport openldap ++
|
optional ldapSupport openldap ++
|
||||||
optional zlibSupport zlib ++
|
optional zlibSupport zlib ++
|
||||||
optional gssSupport kerberos ++
|
optional gssSupport libkrb5 ++
|
||||||
optional c-aresSupport c-ares ++
|
optional c-aresSupport c-ares ++
|
||||||
optional sslSupport openssl ++
|
optional sslSupport openssl ++
|
||||||
optional gnutlsSupport gnutls ++
|
optional gnutlsSupport gnutls ++
|
||||||
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
|||||||
( if brotliSupport then "--with-brotli" else "--without-brotli" )
|
( if brotliSupport then "--with-brotli" else "--without-brotli" )
|
||||||
]
|
]
|
||||||
++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
|
++ 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
|
# For the 'urandom', maybe it should be a cross-system option
|
||||||
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||||
"--with-random=/dev/urandom"
|
"--with-random=/dev/urandom"
|
||||||
|
@ -2128,20 +2128,10 @@ with pkgs;
|
|||||||
|
|
||||||
curl_7_59 = callPackage ../tools/networking/curl/7_59.nix rec {
|
curl_7_59 = callPackage ../tools/networking/curl/7_59.nix rec {
|
||||||
fetchurl = fetchurlBoot;
|
fetchurl = fetchurlBoot;
|
||||||
http2Support = true;
|
|
||||||
zlibSupport = true;
|
|
||||||
sslSupport = zlibSupport;
|
|
||||||
scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
|
|
||||||
gssSupport = !stdenv.hostPlatform.isWindows;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
curl = callPackage ../tools/networking/curl rec {
|
curl = callPackage ../tools/networking/curl rec {
|
||||||
fetchurl = fetchurlBoot;
|
fetchurl = fetchurlBoot;
|
||||||
http2Support = true;
|
|
||||||
zlibSupport = true;
|
|
||||||
sslSupport = zlibSupport;
|
|
||||||
scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
|
|
||||||
gssSupport = !stdenv.hostPlatform.isWindows;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { };
|
curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { };
|
||||||
|
Loading…
Reference in New Issue
Block a user