summary refs log tree commit diff
path: root/pkgs/tools/networking/curl
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-05-03 10:30:47 +0200
committerVladimír Čunát <vcunat@gmail.com>2014-05-03 11:30:53 +0200
commit062e2567c913430aea5d3e26021618bba1aedf62 (patch)
tree675b2b297cad79a0c3502d8b98bb59ff0899aa7f /pkgs/tools/networking/curl
parentca35c44408c2f485f43507f396facf28c10364be (diff)
downloadnixlib-062e2567c913430aea5d3e26021618bba1aedf62.tar
nixlib-062e2567c913430aea5d3e26021618bba1aedf62.tar.gz
nixlib-062e2567c913430aea5d3e26021618bba1aedf62.tar.bz2
nixlib-062e2567c913430aea5d3e26021618bba1aedf62.tar.lz
nixlib-062e2567c913430aea5d3e26021618bba1aedf62.tar.xz
nixlib-062e2567c913430aea5d3e26021618bba1aedf62.tar.zst
nixlib-062e2567c913430aea5d3e26021618bba1aedf62.zip
curl: minor update 7.35.0 -> 7.36.0, including CVE fixes
Diffstat (limited to 'pkgs/tools/networking/curl')
-rw-r--r--pkgs/tools/networking/curl/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 10bfc0e21ec5..3d23d7950fbe 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -13,11 +13,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.35.0";
+  name = "curl-7.36.0";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "10qdzk3lfdpg8lvg8wfiqbfjp5yxyv25y1y2679vgwal2iqd2x6p";
+    sha256 = "1kfgygvmxgaakxl2f3h3jlar23n6xmvg03ybm36pqsydkfw85ghz";
   };
 
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
@@ -30,8 +30,10 @@ stdenv.mkDerivation rec {
     optional sslSupport openssl ++
     optional scpSupport libssh2;
 
+  # for the second line see http://curl.haxx.se/mail/tracker-2014-03/0087.html
   preConfigure = ''
     sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
+    rm src/tool_hugehelp.c
   '';
 
   configureFlags = [