diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-18 18:25:36 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 18:25:36 -0600 |
| commit | 0925c482c8378e8a6a8724edc6596ea60f90a113 (patch) | |
| tree | cc655fd638d40c47cbf43ae6a3bc5d79e814ca24 /pkgs/top-level | |
| parent | 7f1943bee5f9452d02a83686ffe4dec9e91033ad (diff) | |
| parent | 50aef6015ff7f837348dfae9af8190d2744e6c77 (diff) | |
| download | nixlib-0925c482c8378e8a6a8724edc6596ea60f90a113.tar nixlib-0925c482c8378e8a6a8724edc6596ea60f90a113.tar.gz nixlib-0925c482c8378e8a6a8724edc6596ea60f90a113.tar.bz2 nixlib-0925c482c8378e8a6a8724edc6596ea60f90a113.tar.lz nixlib-0925c482c8378e8a6a8724edc6596ea60f90a113.tar.xz nixlib-0925c482c8378e8a6a8724edc6596ea60f90a113.tar.zst nixlib-0925c482c8378e8a6a8724edc6596ea60f90a113.zip | |
Merge pull request #50556 from oxij/pkgs/curl-cleanup
curl: move option defaults from `all-packages.nix` to the derivation itself
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82df7476cc59..8f5d786a90ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2128,20 +2128,10 @@ with pkgs; curl_7_59 = callPackage ../tools/networking/curl/7_59.nix rec { fetchurl = fetchurlBoot; - http2Support = true; - zlibSupport = true; - sslSupport = zlibSupport; - scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; - gssSupport = !stdenv.hostPlatform.isWindows; }; curl = callPackage ../tools/networking/curl rec { 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 { }; |