about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAntonio Nuno Monteiro <anmonteiro@gmail.com>2024-04-30 13:04:55 -0700
committerAntonio Nuno Monteiro <anmonteiro@gmail.com>2024-04-30 13:59:57 -0700
commit684cf9f16fcd148898ba4ed507fcbb18c360c71f (patch)
tree5f755c0c5e323a841781cccc99cee163039f48dc /pkgs
parentd50a896ae5042d9bc9865bc2b00d1df3bd821a63 (diff)
openssl_3_3: init at 3.3.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/openssl/default.nix23
-rw-r--r--pkgs/top-level/all-packages.nix3
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 628cbadf9136f..929a60eb360fe 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 { };