diff options
| author | Ulrik Strid <ulrik.strid@outlook.com> | 2024-05-01 08:56:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-01 08:56:02 +0200 |
| commit | ae1852e70d8c3855493ce4510a2d28b351dfd513 (patch) | |
| tree | 7924d65b7e8a00e42feab8d9352e065e769c8b3d /pkgs | |
| parent | 43bf12a6a04e85bdf4bd663e05db808a6762c036 (diff) | |
| parent | 684cf9f16fcd148898ba4ed507fcbb18c360c71f (diff) | |
Merge pull request #308082 from anmonteiro/anmonteiro/openssl-3.3.0
openssl_3_3: init at 3.3.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c0b4fe75b610e..359ed2832d24d 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 f1406fd302088..5d6d04d8de077 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 { }; |