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

Merge pull request #88195 from ruuda/libressl-3.1

Browse Source 
libressl: add 3.1.3, default to it, remove 2.9
This commit is contained in:
Lassulus 2020-06-19 12:49:15 +02:00 committed by GitHub
commit 6d2c0b8255
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/libressl/default.nix
View File

@ -63,20 +63,13 @@ let
}; };
in { in {
libressl_2_9 = generic {
version = "2.9.2";
sha256 = "1m6mz515dcbrbnyz8hrpdfjzdmj1c15vbgnqxdxb89g3z9kq3iy4";
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [
(fetchpatch {
url = "https://github.com/libressl-portable/portable/pull/529/commits/a747aacc23607c993cc481378782b2c7dd5bc53b.patch";
sha256 = "0wbrcscdkjpk4mhh7f3saghi4smia4lhf7fl6la3ahhgx1krn5zm";
})
];
};
libressl_3_0 = generic { libressl_3_0 = generic {
version = "3.0.2"; version = "3.0.2";
sha256 = "13ir2lpxz8y1m151k7lrx306498nzfhwlvgkgv97v5cvywmifyyz"; sha256 = "13ir2lpxz8y1m151k7lrx306498nzfhwlvgkgv97v5cvywmifyyz";
}; };
libressl_3_1 = generic {
version = "3.1.3";
sha256 = "184znscbkww65aavy2p4v4xncalp1ni19c2w5yvfq4pnmhb06sy7";
};
} }

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

@ -14063,10 +14063,12 @@ in
openvdb = callPackage ../development/libraries/openvdb {}; openvdb = callPackage ../development/libraries/openvdb {};
inherit (callPackages ../development/libraries/libressl { }) inherit (callPackages ../development/libraries/libressl { })
libressl_2_9 libressl_3_0
libressl_3_0; libressl_3_1;
libressl = libressl_3_0; # Please keep this pointed to the latest version. See also
# https://discourse.nixos.org/t/nixpkgs-policy-regarding-libraries-available-in-multiple-versions/7026/2
libressl = libressl_3_1;
boringssl = callPackage ../development/libraries/boringssl { }; boringssl = callPackage ../development/libraries/boringssl { };
@ -26426,6 +26428,9 @@ in
wasmer = callPackage ../development/interpreters/wasmer { }; wasmer = callPackage ../development/interpreters/wasmer { };
wasm-pack = callPackage ../development/tools/wasm-pack { wasm-pack = callPackage ../development/tools/wasm-pack {
# Wasm-pack depends on a version of rust-openssl which is incompatible with
# LibreSSL 3.1, so we explicitly opt for the older version.
libressl = libressl_3_0;
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };