gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssl: 3.5.2 -> 3.6.0; openssl_3: 3.0.17 -> 3.0.18; openssl: enable tests and add comments (#447713)

Browse Source
This commit is contained in:
K900
2025-10-07 09:53:52 +03:00
committed by GitHub
parent 3deb8d270a 87c0c5e50c
commit 8f9b2e5f9a
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/openssl/default.nix
+16 -5
View File
@@ -244,6 +244,11 @@ let
enableParallelBuilding = true;
doCheck = true;
preCheck = ''
patchShebangs util
'';
postInstall =
(
if static then
@@ -364,16 +369,19 @@ in
};
openssl_3 = common {
version = "3.0.17";
hash = "sha256-39135OobV/86bb3msL3D8x21rJnn/dTq+eH7tuwtuM4=";
version = "3.0.18";
hash = "sha256-2Aw09c+QLczx8bXfXruG0DkuNwSeXXPfGzq65y5P/os=";
patches = [
# Support for NIX_SSL_CERT_FILE, motivation:
# https://github.com/NixOS/nixpkgs/commit/942dbf89c6120cb5b52fb2ab456855d1fbf2994e
./3.0/nix-ssl-cert-file.patch
# openssl will only compile in KTLS if the current kernel supports it.
# This patch disables build-time detection.
./3.0/openssl-disable-kernel-detection.patch
# Look up SSL certificates in /etc rather than the immutable installation directory
(
if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch
)
@@ -386,17 +394,20 @@ in
};
};
openssl_3_5 = common {
version = "3.5.2";
hash = "sha256-xTpH5eRByTDDkoz3v2+wDl0Sm2MOCqhzsIJYZW5zRew=";
openssl_3_6 = common {
version = "3.6.0";
hash = "sha256-tqX0S362nj+jXb8VUkQFtEg3pIHUPYHa3d4/8h/LuOk=";
patches = [
# Support for NIX_SSL_CERT_FILE, motivation:
# https://github.com/NixOS/nixpkgs/commit/942dbf89c6120cb5b52fb2ab456855d1fbf2994e
./3.0/nix-ssl-cert-file.patch
# openssl will only compile in KTLS if the current kernel supports it.
# This patch disables build-time detection.
./3.0/openssl-disable-kernel-detection.patch
# Look up SSL certificates in /etc rather than the immutable installation directory
(
if stdenv.hostPlatform.isDarwin then
./3.5/use-etc-ssl-certs-darwin.patch
pkgs/top-level/all-packages.nix
+2 -2
View File
@@ -8369,7 +8369,7 @@ with pkgs;
libressl = libressl_4_1;
openssl = openssl_3_5;
openssl = openssl_3_6;
openssl_legacy = openssl.override {
conf = ../development/libraries/openssl/3.0/legacy.cnf;
@@ -8378,7 +8378,7 @@ with pkgs;
inherit (callPackages ../development/libraries/openssl { })
openssl_1_1
openssl_3
openssl_3_5
openssl_3_6
;
pcre = callPackage ../development/libraries/pcre { };