From 3a690e9833067561943a0016ce40406b8b5fc16f Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Thu, 6 Oct 2022 22:07:02 +0200 Subject: [PATCH] libressl: 3.5.3 -> 3.6.0 We should also remove 3.4, as it will become unsupported in a week (one year after the OpenBSD 7.0 release), but some packages explicitly depend on it, so I'm not removing it yet. --- pkgs/development/libraries/libressl/default.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 82974fe07283..000678652cad 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -102,4 +102,18 @@ in { }) ]; }; + + libressl_3_6 = generic { + version = "3.6.0"; + hash = "sha256-GxLe/Lvb2+2oaSnkIQAK8PQjM63UgX/SbA2aGuxHhAQ="; + + patches = [ + # Fix endianness detection on aarch64-darwin, issue #181187 + (fetchpatch { + name = "fix-endian-header-detection.patch"; + url = "https://patch-diff.githubusercontent.com/raw/libressl-portable/portable/pull/771.patch"; + sha256 = "sha256-in5U6+sl0HB9qMAtUL6Py4X2rlv0HsqRMIQhhM1oThE="; + }) + ]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 543737314c1e..0be6ca333d9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21231,9 +21231,10 @@ with pkgs; inherit (callPackages ../development/libraries/libressl { }) libressl_3_4 - libressl_3_5; + libressl_3_5 + libressl_3_6; - libressl = libressl_3_5; + libressl = libressl_3_6; boringssl = callPackage ../development/libraries/boringssl { };