From cd2ccdd6aa3789f3ed0a3298a117f1254850378b Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 9 Apr 2025 12:39:06 +0200
Subject: [PATCH] zulu24: init at 24.0.0

---
 pkgs/development/compilers/zulu/24.nix | 58 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  1 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/compilers/zulu/24.nix

diff --git a/pkgs/development/compilers/zulu/24.nix b/pkgs/development/compilers/zulu/24.nix
new file mode 100644
index 000000000000..28e876e4ca0b
--- /dev/null
+++ b/pkgs/development/compilers/zulu/24.nix
@@ -0,0 +1,58 @@
+{
+  callPackage,
+  enableJavaFX ? false,
+  ...
+}@args:
+
+let
+  # For 24 JDK FX is newer than regular JDK?
+  zuluVersion = if enableJavaFX then "24.28.85" else "24.28.83";
+in
+callPackage ./common.nix (
+  {
+    # Details from https://www.azul.com/downloads/?version=java-24&package=jdk
+    # Note that the latest build may differ by platform
+    dists = {
+      x86_64-linux = {
+        inherit zuluVersion;
+        jdkVersion = "24.0.0";
+        hash =
+          if enableJavaFX then
+            "sha256-y8jiE5yECh96pHYZFM0Q/JTiVcm5a0PONYJDLYydCT0="
+          else
+            "sha256-Kf6gF8A8ZFIhujEgjlENeuSPVzW6QWnVZcRst35/ZvI=";
+      };
+
+      aarch64-linux = {
+        inherit zuluVersion;
+        jdkVersion = "24.0.0";
+        hash =
+          if enableJavaFX then
+            "sha256-H6YD8uhk9rTpd+3/S1+7QVzpCi6jykWKyu7RPxMx/sI="
+          else
+            "sha256-6J7szd/ax9xCMNA9efw9Bhgv/VwQFXz5glWIoj+UYIc=";
+      };
+
+      x86_64-darwin = {
+        inherit zuluVersion;
+        jdkVersion = "24.0.0";
+        hash =
+          if enableJavaFX then
+            "sha256-lMdbPkUdXyNcye8uMxGIhZTErrTI0P0SnqMS+8+Rjqg="
+          else
+            "sha256-e7KJtJ9+mFFSdKCj68thfTXguWH5zXaSSb9phzXf/lQ=";
+      };
+
+      aarch64-darwin = {
+        inherit zuluVersion;
+        jdkVersion = "24.0.0";
+        hash =
+          if enableJavaFX then
+            "sha256-oR2x0vphBGgh3KkEkLAcmtIMNONny9/b32z9jLR98X0="
+          else
+            "sha256-7yXLOJCK0RZ8V1vsexOGxGR9NAwi/pCl95BlO8E8nGU=";
+      };
+    };
+  }
+  // builtins.removeAttrs args [ "callPackage" ]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d35d3f0b7e8..f1fc48cfecc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6597,6 +6597,7 @@ with pkgs;
   zulu17 = callPackage ../development/compilers/zulu/17.nix { };
   zulu21 = callPackage ../development/compilers/zulu/21.nix { };
   zulu23 = callPackage ../development/compilers/zulu/23.nix { };
+  zulu24 = callPackage ../development/compilers/zulu/24.nix { };
   zulu = zulu21;
 
   ### DEVELOPMENT / INTERPRETERS