From 760f00091cf53c03e8175bc7132602265358ad77 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 7 May 2023 16:31:46 +0100
Subject: [PATCH 1/2] libressl_3_5: remove
---
pkgs/development/libraries/libressl/default.nix | 14 --------------
pkgs/top-level/aliases.nix | 1 +
pkgs/top-level/all-packages.nix | 2 --
3 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index bb8271cfb44e..b4916631058b 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -107,20 +107,6 @@ in {
];
};
- libressl_3_5 = generic {
- version = "3.5.4";
- hash = "sha256-A3naE0Si9xrUpOO+MO+dgu7N3Of43CrmZjGh3+FDQ6w=";
-
- 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=";
- })
- ];
- };
-
libressl_3_6 = generic {
version = "3.6.2";
hash = "sha256-S+gP/wc3Rs9QtKjlur4nlayumMaxMqngJRm0Rd+/0DM=";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 12281c39e343..aa2dd6c2f956 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -866,6 +866,7 @@ mapAliases ({
librdf = lrdf; # Added 2020-03-22
librecad2 = throw "'librecad2' has been renamed to/replaced by 'librecad'"; # Converted to throw 2022-02-22
libressl_3_2 = throw "'libressl_3_2' has reached end-of-life "; # Added 2022-03-19
+ libressl_3_5 = throw "'libressl_3_5' has reached end-of-life "; # Added 2023-05-07
librevisa = throw "librevisa has been removed because its website and source have disappeared upstream"; # Added 2022-09-23
librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24
librtlsdr = rtl-sdr; # Added 2023-02-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbca18144b4e..da77f453d87a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23156,7 +23156,6 @@ with pkgs;
inherit (callPackages ../development/libraries/libressl { })
libressl_3_4
- libressl_3_5
libressl_3_6;
libressl = libressl_3_6;
@@ -39594,7 +39593,6 @@ with pkgs;
wasm-pack = callPackage ../development/tools/wasm-pack {
inherit (darwin.apple_sdk.frameworks) Security;
- libressl = libressl_3_5;
};
wasynth = callPackage ../development/tools/wasynth { };
From 220cb2276b58d2b01e2a872dd8dd23f3d803e3e8 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 7 May 2023 16:37:43 +0100
Subject: [PATCH 2/2] libressl: 3.6.2 -> 3.7.2
---
pkgs/development/libraries/libressl/default.nix | 5 +++++
pkgs/top-level/all-packages.nix | 6 ++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index b4916631058b..ed12158fc081 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -111,4 +111,9 @@ in {
version = "3.6.2";
hash = "sha256-S+gP/wc3Rs9QtKjlur4nlayumMaxMqngJRm0Rd+/0DM=";
};
+
+ libressl_3_7 = generic {
+ version = "3.7.2";
+ hash = "sha256-sGqlOP78nGszxNtJMaCaX1LZ0jVyGa/L/32T/hLr9vc=";
+ };
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da77f453d87a..4ef68ac32d4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23156,9 +23156,10 @@ with pkgs;
inherit (callPackages ../development/libraries/libressl { })
libressl_3_4
- libressl_3_6;
+ libressl_3_6
+ libressl_3_7;
- libressl = libressl_3_6;
+ libressl = libressl_3_7;
boringssl = callPackage ../development/libraries/boringssl { };
@@ -39593,6 +39594,7 @@ with pkgs;
wasm-pack = callPackage ../development/tools/wasm-pack {
inherit (darwin.apple_sdk.frameworks) Security;
+ libressl = libressl_3_6;
};
wasynth = callPackage ../development/tools/wasynth { };