diff options
| -rw-r--r-- | pkgs/development/libraries/libressl/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
2 files changed, 13 insertions, 15 deletions
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 285d7b607e7..bb9fb777289 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -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.3"; + sha256 = "184znscbkww65aavy2p4v4xncalp1ni19c2w5yvfq4pnmhb06sy7"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0a2c0b49e4..81da6b35330 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14063,10 +14063,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; boringssl = callPackage ../development/libraries/boringssl { }; @@ -26426,6 +26428,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; }; |