nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

openssl_3_2: remove and switch single user to the default openssl

Browse Source 
Signed-off-by: Markus Theil <theil.markus@gmail.com>

Picked from PR https://github.com/NixOS/nixpkgs/pull/345998
except that vcunat used `openssl` instead of `openssl_3_3`

I do think that we should be well covered with 3.0 and 3.3.
https://github.com/openssl/openssl/blob/openssl-3.3.0/NEWS.md
This commit is contained in:
Markus Theil 2024-10-05 11:09:56 +02:00 committed by Vladimír Čunát
parent 3997afd38f
commit b7e2eb1e21
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
5 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs-darwin.patch → pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs-darwin.patch
View File

0
pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch → pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs.patch
View File

27
pkgs/development/libraries/openssl/default.nix
View File

@ -312,29 +312,6 @@ in {
}; };
}; };
openssl_3_2 = common {
version = "3.2.3";
hash = "sha256-UrXxxrgCK8WGjDCMVPt3cF5wLWxvRZT5mg3yFqz0Yjk=";
patches = [
./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
(if stdenv.hostPlatform.isDarwin
then ./3.2/use-etc-ssl-certs-darwin.patch
else ./3.2/use-etc-ssl-certs.patch)
];
withDocs = true;
extraMeta = {
license = lib.licenses.asl20;
};
};
openssl_3_3 = common { openssl_3_3 = common {
version = "3.3.2"; version = "3.3.2";
hash = "sha256-LopAsBl5r+i+C7+z3l3BxnCf7bRtbInBDaEUq1/D0oE="; hash = "sha256-LopAsBl5r+i+C7+z3l3BxnCf7bRtbInBDaEUq1/D0oE=";
@ -347,8 +324,8 @@ in {
./3.0/openssl-disable-kernel-detection.patch ./3.0/openssl-disable-kernel-detection.patch
(if stdenv.hostPlatform.isDarwin (if stdenv.hostPlatform.isDarwin
then ./3.2/use-etc-ssl-certs-darwin.patch then ./3.3/use-etc-ssl-certs-darwin.patch
else ./3.2/use-etc-ssl-certs.patch) else ./3.3/use-etc-ssl-certs.patch)
]; ];
withDocs = true; withDocs = true;

4
pkgs/tools/networking/cloudflare-warp/default.nix
View File

@ -11,7 +11,7 @@
, makeWrapper , makeWrapper
, nftables , nftables
, nss , nss
, openssl_3_2 , openssl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
dbus dbus
gtk3 gtk3
libpcap libpcap
openssl_3_2 openssl
nss nss
stdenv.cc.cc.lib stdenv.cc.cc.lib
]; ];

1
pkgs/top-level/all-packages.nix
View File

@ -22467,7 +22467,6 @@ with pkgs;
inherit (callPackages ../development/libraries/openssl { }) inherit (callPackages ../development/libraries/openssl { })
openssl_1_1 openssl_1_1
openssl_3 openssl_3
openssl_3_2
openssl_3_3; openssl_3_3;
opensubdiv = callPackage ../development/libraries/opensubdiv { }; opensubdiv = callPackage ../development/libraries/opensubdiv { };