public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssl_1_0_1: remove

Browse Source
This commit is contained in:
Robin Gloster 2017-01-27 21:28:42 +01:00
parent 61b673c1f1
commit 426b61a1c7
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/openssl/default.nix
View File

@ -25,8 +25,8 @@ let
(versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem"))) (versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")))
./darwin-arch.patch; ./darwin-arch.patch;
outputs = [ "bin" "dev" "out" "man" ]; outputs = [ "bin" "dev" "out" "man" ];
setOutputFlags = false; setOutputFlags = false;
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
@ -50,7 +50,7 @@ let
postConfigure = if makeDepend then "make depend" else null; postConfigure = if makeDepend then "make depend" else null;
makeFlags = [ "MANDIR=$(man)/share/man" ]; makeFlags = [ "MANDIR=$(man)/share/man" ];
# Parallel building is broken in OpenSSL. # Parallel building is broken in OpenSSL.
enableParallelBuilding = false; enableParallelBuilding = false;
@ -109,11 +109,6 @@ let
in { in {
openssl_1_0_1-vulnerable = common {
version = "1.0.1u";
sha256 = "0fb7y9pwbd76pgzd7xzqfrzibmc0vf03sl07f34z5dhm2b5b84j3";
};
openssl_1_0_2 = common { openssl_1_0_2 = common {
version = "1.0.2k"; version = "1.0.2k";
sha256 = "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb"; sha256 = "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb";

3
pkgs/top-level/all-packages.nix
View File

@ -3894,7 +3894,7 @@ with pkgs;
sshpass = callPackage ../tools/networking/sshpass { }; sshpass = callPackage ../tools/networking/sshpass { };
sslscan = callPackage ../tools/security/sslscan { 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 { }; sslmate = callPackage ../development/tools/sslmate { };
@ -9002,7 +9002,6 @@ with pkgs;
onlyHeaders = true; onlyHeaders = true;
}; };
}) })
openssl_1_0_1-vulnerable
openssl_1_0_2 openssl_1_0_2
openssl_1_1_0 openssl_1_1_0
openssl_1_0_2-steam; openssl_1_0_2-steam;