Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libressl: add 3.1.3, default to it, remove 2.9 #88195

Merged
merged 6 commits into from Jun 19, 2020
Merged

libressl: add 3.1.3, default to it, remove 2.9 #88195

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a287e7
libressl_3_1: init at 3.1.1
ruuda May 19, 2020
79865f4
libressl_2_9: remove, not maintained anymore
ruuda May 19, 2020
e0cc9f3
libressl: switch to 3.1 branch
ruuda May 19, 2020
fd3f22f
libressl_3_1: 3.1.1 -> 3.1.2
ruuda May 25, 2020
92f0801
wasm-pack: depend on libressl_3_0 explicitly
ruuda May 26, 2020
7903e4b
libressl_3_1: 3.1.2 -> 3.1.3
ruuda Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 5 additions & 12 deletions pkgs/development/libraries/libressl/default.nix
View file
Open in desktop
Expand Up @@ -63,20 +63,13 @@ let
};

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 {
version = "3.0.2";
sha256 = "13ir2lpxz8y1m151k7lrx306498nzfhwlvgkgv97v5cvywmifyyz";
};

libressl_3_1 = generic {
version = "3.1.2";
sha256 = "14nqg34yc9bm64hz96hhlvm00gwn2acjs0hcwhs9l50plrz2z2pq";
};
}
11 changes: 8 additions & 3 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Expand Up @@ -13999,10 +13999,12 @@ in
openvdb = callPackage ../development/libraries/openvdb {};

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;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, I'd like to see a comment here, indicating future contributors, that libressl should always point to the latest version. See https://discourse.nixos.org/t/nixpkgs-policy-regarding-libraries-available-in-multiple-versions/7026 .

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a comment, with a link to that topic.


boringssl = callPackage ../development/libraries/boringssl { };

Expand Down Expand Up @@ -26252,6 +26254,9 @@ in
wasmer = callPackage ../development/interpreters/wasmer { };

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;
};

Expand Down