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

Merge pull request #62180 from dtzWill/update/openssl-1.1.1c-1.0.2s

Browse Source 
openssl: 1.1.1c, 1.0.2s
This commit is contained in:
Peter Simons 2019-05-29 19:46:11 +02:00 committed by GitHub
commit cd76032c1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,8 +120,8 @@ let
in { in {
openssl_1_0_2 = common { openssl_1_0_2 = common {
version = "1.0.2r"; version = "1.0.2s";
sha256 = "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf"; sha256 = "15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa";
patches = [ patches = [
./1.0.2/nix-ssl-cert-file.patch ./1.0.2/nix-ssl-cert-file.patch
@ -132,15 +132,10 @@ in {
}; };
openssl_1_1 = common { openssl_1_1 = common {
version = "1.1.1b"; version = "1.1.1c";
sha256 = "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw"; sha256 = "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn";
patches = [ patches = [
./1.1/nix-ssl-cert-file.patch ./1.1/nix-ssl-cert-file.patch
(fetchurl {
name = "long-chacha-nonce.patch";
url = "https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=f426625b6ae9a7831010750490a5f0ad689c5ba3";
sha256= "02ghqg3vzmzx3s1dwwwbm1p1l4asaiampyg4k9vfrjwficvgpdgp";
})
(if stdenv.hostPlatform.isDarwin (if stdenv.hostPlatform.isDarwin
then ./1.1/use-etc-ssl-certs-darwin.patch then ./1.1/use-etc-ssl-certs-darwin.patch