Merge branch 'staging'

2016-08-10 22:09:38 +02:00
parent f191b65820 6f5c6fb6a1
commit 947abb08ac
30 changed files with 180 additions and 174 deletions
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -18,11 +18,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;

 stdenv.mkDerivation rec {
-  name = "curl-7.47.1";
+  name = "curl-7.50.1";

  src = fetchurl {
    url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "13z9gba3q2ybp50z0gdkzhwcx9m0i7qkvm278yz4pql2jfml7inx";
+    sha256 = "0mjidq4q0hikhis2d35kzkhx6xfcgl875mk5ph5d98fa9kswa4iw";
  };

  outputs = [ "dev" "out" "bin" "man" "docdev" ];