summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorTim Steinbach <NeQuissimus@users.noreply.github.com>2018-06-04 18:25:23 -0400
committerOrivej Desh <orivej@gmx.fr>2018-06-04 22:25:23 +0000
commit5574df35497a228a437873e48655edbca1bdcdcc (patch)
treead98cf3311574812d2e0a588386c3fa7521d033b /pkgs/top-level
parentf19e64a0d286527f12c2995967305ed1f763a84e (diff)
downloadnixlib-5574df35497a228a437873e48655edbca1bdcdcc.tar
nixlib-5574df35497a228a437873e48655edbca1bdcdcc.tar.gz
nixlib-5574df35497a228a437873e48655edbca1bdcdcc.tar.bz2
nixlib-5574df35497a228a437873e48655edbca1bdcdcc.tar.lz
nixlib-5574df35497a228a437873e48655edbca1bdcdcc.tar.xz
nixlib-5574df35497a228a437873e48655edbca1bdcdcc.tar.zst
nixlib-5574df35497a228a437873e48655edbca1bdcdcc.zip
nix: point at curl 7.59.0 (#41452)
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 693b96aac4a2..cdb937efd06f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1891,6 +1891,15 @@ with pkgs;
     brotliSupport = true;
   };
 
+  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 = true;
+  };
+
   curl = callPackage ../tools/networking/curl rec {
     fetchurl = fetchurlBoot;
     http2Support = true;
@@ -20880,6 +20889,7 @@ with pkgs;
   inherit (callPackages ../tools/package-management/nix {
       storeDir = config.nix.storeDir or "/nix/store";
       stateDir = config.nix.stateDir or "/nix/var";
+      curl = curl_7_59;
       })
     nix
     nix1