From e0d17fdf105340f28c2208bb750f0a32f136f0fc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Mar 2016 15:25:53 +0100 Subject: [PATCH] openssl: Use 1.0.2 by default Provided that not too much breaks, we should probably cherry-pick this to 16.03, since the end of the 1.0.1 support window is a bit too close to the expected lifetime of 16.0.3. @domenkozar --- pkgs/development/libraries/openssl/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 432f9c42b51..081f71b498e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -104,9 +104,9 @@ in { sha256 = "e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511"; }; - openssl_1_0_2 = lowPrio (common { + openssl_1_0_2 = common { version = "1.0.2g"; sha256 = "b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33"; - }); + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2eddc9a3891..bc56c08a0e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2201,12 +2201,10 @@ let nodejs-5_x = callPackage ../development/web/nodejs/v5.nix { libtool = darwin.cctools; - openssl = openssl_1_0_2; }; nodejs-4_x = callPackage ../development/web/nodejs/v4.nix { libtool = darwin.cctools; - openssl = openssl_1_0_2; }; nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { @@ -8276,7 +8274,7 @@ let wolfssl = callPackage ../development/libraries/wolfssl { }; - openssl = openssl_1_0_1; + openssl = openssl_1_0_2; inherit (callPackages ../development/libraries/openssl { fetchurl = fetchurlBoot;