Merge branch 'master' into staging

2016-02-07 13:52:42 +01:00
parent 234f461139 98ffc61e2f
commit a115bff08c
514 changed files with 24027 additions and 15228 deletions
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  name = "curl-7.47.0";

  src = fetchurl {
-    url = "http://curl.haxx.se/download/${name}.tar.bz2";
+    url = "http://ngcobalt13.uxnr.de/mirror/curl/${name}.tar.bz2";
    sha256 = "0riz70pjg82gbcfi2ndvsksb2dv55g31ir8piph2p6zvhy9ny29b";
  };