Merge branch 'master' into closure-size

2015-12-11 18:31:00 +01:00
parent 2f0fe05543 146784f835
commit 5b0352a6a4
577 changed files with 28738 additions and 7408 deletions
@@ -8,14 +8,14 @@ let
    stdenv.cross;
 in
 stdenv.mkDerivation rec {
-  name = "openssl-1.0.1p";
+  name = "openssl-1.0.1q";

  src = fetchurl {
    urls = [
      "http://www.openssl.org/source/${name}.tar.gz"
      "http://openssl.linux-mirror.org/source/${name}.tar.gz"
    ];
-    sha1 = "9d1977cc89242cd11471269ece2ed4650947c046";
+    sha256 = "1dvz0hx7fjxag06b51pawy154y6d2xajm5rwxmfnlq7ax628nrdk";
  };

  patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch