From d1d3bee38ab9d59fd96b105c5ebc9a7882399653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 14 Nov 2025 21:59:31 +0100 Subject: [PATCH 1/3] sparrow: zulu24 -> zulu25 --- pkgs/by-name/sp/sparrow/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/sparrow/package.nix b/pkgs/by-name/sp/sparrow/package.nix index 2533b628abe7..c31e9efeed4f 100644 --- a/pkgs/by-name/sp/sparrow/package.nix +++ b/pkgs/by-name/sp/sparrow/package.nix @@ -7,7 +7,7 @@ makeDesktopItem, copyDesktopItems, autoPatchelfHook, - zulu24, + zulu25, gtk3, gsettings-desktop-schemas, writeScript, @@ -27,7 +27,7 @@ let pname = "sparrow"; version = "2.2.3"; - openjdk = zulu24.override { enableJavaFX = true; }; + openjdk = zulu25.override { enableJavaFX = true; }; sparrowArch = { From cd32dbcac1372437660e5e15aa9964e01ee635ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 14 Nov 2025 22:05:29 +0100 Subject: [PATCH 2/3] zulu23: drop --- pkgs/development/compilers/zulu/23.nix | 54 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/compilers/zulu/23.nix diff --git a/pkgs/development/compilers/zulu/23.nix b/pkgs/development/compilers/zulu/23.nix deleted file mode 100644 index 836d545ab2af..000000000000 --- a/pkgs/development/compilers/zulu/23.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - callPackage, - enableJavaFX ? false, - ... -}@args: - -callPackage ./common.nix ( - { - # Details from https://www.azul.com/downloads/?version=java-23-lts&package=jdk - # Note that the latest build may differ by platform - dists = { - x86_64-linux = { - zuluVersion = "23.28.85"; - jdkVersion = "23.0.0"; - hash = - if enableJavaFX then - "sha256-HEQ0lxHsoyHG+ZWIlWsbkqMf/rauARafzWoiElRwekA=" - else - "sha256-a1YPqBMaWkoruNFoSckLyx00LCOZNsowlSn2L3XCDJA="; - }; - - aarch64-linux = { - zuluVersion = "23.28.85"; - jdkVersion = "23.0.0"; - hash = - if enableJavaFX then - throw "JavaFX is not available for aarch64-linux" - else - "sha256-/i+ch7BMAwMQ1C4e3shp9BHuQ67vVXfmIK1YKs7L24M="; - }; - - x86_64-darwin = { - zuluVersion = "23.28.85"; - jdkVersion = "23.0.0"; - hash = - if enableJavaFX then - "sha256-1/YmLWA/men8jMjnhkZVMf2irf6Tc/5x7UECxqKJcL4=" - else - "sha256-rEr8M3KF9Z95gV8sHqi5lQD2RJjtssZx8Q8goy6danw="; - }; - - aarch64-darwin = { - zuluVersion = "23.28.85"; - jdkVersion = "23.0.0"; - hash = - if enableJavaFX then - "sha256-TumPJoHmvklMlcpF4PFY/Arcdc5fkX5z0xeIuNFxluQ=" - else - "sha256-gFvfJL0RQgIOATLTMdfa+fStUCrdHYC3rxy0j5eNVDc="; - }; - }; - } - // removeAttrs args [ "callPackage" ] -) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 54a75385c096..d452b1acc992 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1686,6 +1686,7 @@ mapAliases { zotify = throw "zotify has been removed due to lack of upstream maintenance"; # Added 2025-09-26 zq = throw "zq has been replaced by zed"; # Converted to throw 2025-10-26 zsh-git-prompt = throw "zsh-git-prompt was removed as it is unmaintained upstream"; # Added 2025-08-28 + zulu23 = throw "Zulu OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-14 zyn-fusion = throw "'zyn-fusion' has been renamed to/replaced by 'zynaddsubfx'"; # Converted to throw 2025-10-27 # keep-sorted end } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d79a0a739829..65c8030437c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5427,7 +5427,6 @@ with pkgs; zulu11 = callPackage ../development/compilers/zulu/11.nix { }; 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 { }; zulu25 = callPackage ../development/compilers/zulu/25.nix { }; }) @@ -5435,7 +5434,6 @@ with pkgs; zulu11 zulu17 zulu21 - zulu23 zulu24 zulu25 ; From 550d60aa8372534a95ba2cab967593ef0ca43bff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 14 Nov 2025 22:06:19 +0100 Subject: [PATCH 3/3] zulu24: drop --- pkgs/development/compilers/zulu/24.nix | 55 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 pkgs/development/compilers/zulu/24.nix diff --git a/pkgs/development/compilers/zulu/24.nix b/pkgs/development/compilers/zulu/24.nix deleted file mode 100644 index 36a545742d06..000000000000 --- a/pkgs/development/compilers/zulu/24.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - callPackage, - enableJavaFX ? false, - ... -}@args: - -let - # For 24 JDK FX can be different version than regular JDK - zuluVersion = if enableJavaFX then "24.32.13" else "24.32.13"; - jdkVersion = "24.0.2"; -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; - hash = - if enableJavaFX then - "sha256-6ZCa348yFLoZ70iDjNkN17dl1IWe53HxKMGpMhFuEOE=" - else - "sha256-seZl5oZmHJlAFsOR6mFAvX9CEY+WatKIeYbi7W8RO/U="; - }; - - aarch64-linux = { - inherit zuluVersion jdkVersion; - hash = - if enableJavaFX then - "sha256-pVspe5R5INmEIJNiihDanOwleBklUp7Svj1NwzOe+ws=" - else - "sha256-hV19g22QKWngOvNGh4dCaTOzLke6VjdsPCGQiVlyij0="; - }; - - x86_64-darwin = { - inherit zuluVersion jdkVersion; - hash = - if enableJavaFX then - "sha256-JXsx8GvjPEQO9ZN3p+CraSWeqc0KDIRBado+jz7l2ww=" - else - "sha256-UHY+Oy6g98bVk5BTfd/Mx3OT5He9SnWUR0L+LZso3Lo="; - }; - - aarch64-darwin = { - inherit zuluVersion jdkVersion; - hash = - if enableJavaFX then - "sha256-Z825S6qxHMm3kwHQnu15dihguDOrxlM1lca3wU8lCqk=" - else - "sha256-jDHoPG4NpNXVK35yNHe5JBkmaKNAixmmMEE0P9jcfnU="; - }; - }; - } - // removeAttrs args [ "callPackage" ] -) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d452b1acc992..ebea08a806aa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1687,6 +1687,7 @@ mapAliases { zq = throw "zq has been replaced by zed"; # Converted to throw 2025-10-26 zsh-git-prompt = throw "zsh-git-prompt was removed as it is unmaintained upstream"; # Added 2025-08-28 zulu23 = throw "Zulu OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-14 + zulu24 = throw "Zulu OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-11-14 zyn-fusion = throw "'zyn-fusion' has been renamed to/replaced by 'zynaddsubfx'"; # Converted to throw 2025-10-27 # keep-sorted end } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65c8030437c9..5ce952f2b3a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5427,14 +5427,12 @@ with pkgs; zulu11 = callPackage ../development/compilers/zulu/11.nix { }; zulu17 = callPackage ../development/compilers/zulu/17.nix { }; zulu21 = callPackage ../development/compilers/zulu/21.nix { }; - zulu24 = callPackage ../development/compilers/zulu/24.nix { }; zulu25 = callPackage ../development/compilers/zulu/25.nix { }; }) zulu8 zulu11 zulu17 zulu21 - zulu24 zulu25 ; zulu = zulu21;