openssl_3_4: init at 3.4.1; openssl_3_3: remove; openssl_3: 3.0.15 -> 3.0.16 (#372733)

This commit is contained in:
K900
2025-02-11 18:11:35 +03:00
committed by GitHub
5 changed files with 11 additions and 11 deletions
@@ -344,8 +344,8 @@ in
};
openssl_3 = common {
version = "3.0.15";
hash = "sha256-I8Zm0O3yDxQkmz2PA2isrumrWFsJ4d6CEHxm4fPslTM=";
version = "3.0.16";
hash = "sha256-V+A8UP6rXTGxUq8rdk8QN5rs2O6S8WyYWYPOSpn374Y=";
patches = [
./3.0/nix-ssl-cert-file.patch
@@ -366,9 +366,9 @@ in
};
};
openssl_3_3 = common {
version = "3.3.2";
hash = "sha256-LopAsBl5r+i+C7+z3l3BxnCf7bRtbInBDaEUq1/D0oE=";
openssl_3_4 = common {
version = "3.4.1";
hash = "sha256-1LIlJ6ZFrPdrU+REh6jbaHxu7WIdckaJHQJeOLqMllE=";
patches = [
./3.0/nix-ssl-cert-file.patch
@@ -379,9 +379,9 @@ in
(
if stdenv.hostPlatform.isDarwin then
./3.3/use-etc-ssl-certs-darwin.patch
./3.4/use-etc-ssl-certs-darwin.patch
else
./3.3/use-etc-ssl-certs.patch
./3.4/use-etc-ssl-certs.patch
)
];
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
../openssl/3.0/openssl-disable-kernel-detection.patch
(if stdenv.hostPlatform.isDarwin
then ../openssl/3.3/use-etc-ssl-certs-darwin.patch
else ../openssl/3.3/use-etc-ssl-certs.patch)
then ../openssl/3.4/use-etc-ssl-certs-darwin.patch
else ../openssl/3.4/use-etc-ssl-certs.patch)
];
postPatch = ''
+2 -2
View File
@@ -10196,7 +10196,7 @@ with pkgs;
inherit (darwin.apple_sdk_11_0.frameworks) Security;
};
openssl = openssl_3_3;
openssl = openssl_3_4;
openssl_legacy = openssl.override {
conf = ../development/libraries/openssl/3.0/legacy.cnf;
@@ -10205,7 +10205,7 @@ with pkgs;
inherit (callPackages ../development/libraries/openssl { })
openssl_1_1
openssl_3
openssl_3_3;
openssl_3_4;
openwebrx = callPackage ../applications/radio/openwebrx {
inherit (python3Packages)