diff options
| author | Robin Gloster <mail@glob.in> | 2017-01-27 21:28:42 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-01-27 21:29:53 +0100 |
| commit | 426b61a1c74b1a4d72b7740b17605503bda5873a (patch) | |
| tree | 65953576d0e3243c091b191589b6c403fc08e6c1 /pkgs | |
| parent | 61b673c1f1dd8aadb78d110ac14765959ad3f46c (diff) | |
| download | nixlib-426b61a1c74b1a4d72b7740b17605503bda5873a.tar nixlib-426b61a1c74b1a4d72b7740b17605503bda5873a.tar.gz nixlib-426b61a1c74b1a4d72b7740b17605503bda5873a.tar.bz2 nixlib-426b61a1c74b1a4d72b7740b17605503bda5873a.tar.lz nixlib-426b61a1c74b1a4d72b7740b17605503bda5873a.tar.xz nixlib-426b61a1c74b1a4d72b7740b17605503bda5873a.tar.zst nixlib-426b61a1c74b1a4d72b7740b17605503bda5873a.zip | |
openssl_1_0_1: remove
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index b65f7880de56..7b413fa92d1c 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -25,8 +25,8 @@ let (versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem"))) ./darwin-arch.patch; - outputs = [ "bin" "dev" "out" "man" ]; - setOutputFlags = false; + outputs = [ "bin" "dev" "out" "man" ]; + setOutputFlags = false; nativeBuildInputs = [ perl ]; buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; @@ -50,7 +50,7 @@ let postConfigure = if makeDepend then "make depend" else null; - makeFlags = [ "MANDIR=$(man)/share/man" ]; + makeFlags = [ "MANDIR=$(man)/share/man" ]; # Parallel building is broken in OpenSSL. enableParallelBuilding = false; @@ -109,11 +109,6 @@ let in { - openssl_1_0_1-vulnerable = common { - version = "1.0.1u"; - sha256 = "0fb7y9pwbd76pgzd7xzqfrzibmc0vf03sl07f34z5dhm2b5b84j3"; - }; - openssl_1_0_2 = common { version = "1.0.2k"; sha256 = "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6690278ccab4..c7769179b1c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3894,7 +3894,7 @@ with pkgs; sshpass = callPackage ../tools/networking/sshpass { }; sslscan = callPackage ../tools/security/sslscan { - openssl = openssl_1_0_1-vulnerable.override { enableSSL2 = true; }; + openssl = openssl_1_0_2.override { enableSSL2 = true; }; }; sslmate = callPackage ../development/tools/sslmate { }; @@ -9002,7 +9002,6 @@ with pkgs; onlyHeaders = true; }; }) - openssl_1_0_1-vulnerable openssl_1_0_2 openssl_1_1_0 openssl_1_0_2-steam; |