From 684cf9f16fcd148898ba4ed507fcbb18c360c71f Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Tue, 30 Apr 2024 13:04:55 -0700 Subject: [PATCH] openssl_3_3: init at 3.3.0 --- .../development/libraries/openssl/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c0b4fe75b610..359ed2832d24 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -309,4 +309,27 @@ in { license = licenses.asl20; }; }; + + openssl_3_3 = common { + version = "3.3.0"; + hash = "sha256-U+ZrBDMipgar8Ah+dpmg4DOjf6E/65dC3zXDozsY+wI="; + + 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 = with lib; { + license = licenses.asl20; + }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 628cbadf9136..929a60eb360f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23811,7 +23811,8 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 openssl_3 - openssl_3_2; + openssl_3_2 + openssl_3_3; opensubdiv = callPackage ../development/libraries/opensubdiv { };