Merge branch 'master' into staging

2017-01-09 23:57:28 +01:00
parent abcd344ccb 41b69a09b6
commit bba12a6c90
97 changed files with 2089 additions and 808 deletions
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    urls =
-      [ "http://www.zlib.net/${name}.tar.gz"  # old versions vanish from here
+      [ "http://www.zlib.net/fossils/${name}.tar.gz"  # stable archive path
        "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz"
      ];
    sha256 = "05w0jwsqib44jz5jazh7cqz311z4g7znnzn6w6v8g1z4iilryzld";