From fb14bff941edb0eb8b769813249a2d3d75dbac84 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Mon, 11 May 2026 22:01:55 -0600 Subject: [PATCH] zulu{8,11,17,21,24,25}: update --- pkgs/development/compilers/zulu/11.nix | 33 +++++++++++----------- pkgs/development/compilers/zulu/17.nix | 33 +++++++++++----------- pkgs/development/compilers/zulu/21.nix | 20 ++++++------- pkgs/development/compilers/zulu/25.nix | 31 +++++++++----------- pkgs/development/compilers/zulu/8.nix | 33 +++++++++++----------- pkgs/development/compilers/zulu/common.nix | 4 +-- 6 files changed, 74 insertions(+), 80 deletions(-) diff --git a/pkgs/development/compilers/zulu/11.nix b/pkgs/development/compilers/zulu/11.nix index 0ff3cb7e1c56..c2cd6f3de104 100644 --- a/pkgs/development/compilers/zulu/11.nix +++ b/pkgs/development/compilers/zulu/11.nix @@ -3,50 +3,49 @@ enableJavaFX ? false, ... }@args: - +let + zuluVersion = "11.88.17"; + jdkVersion = "11.0.31"; +in callPackage ./common.nix ( { # Details from https://www.azul.com/downloads/?version=java-11-lts&package=jdk # Note that the latest build may differ by platform dists = { x86_64-linux = { - zuluVersion = "11.74.15"; - jdkVersion = "11.0.24"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-eP2BCD77uRmukd48+pDlIlhos9RjL9VYx8tpQdq2uNo=" + "sha256-6XkzzHuNjX8OrTLBhFbfQ4ZOjZPLJw2pWvk7CiJzPXE=" else - "sha256-p6rA5pqZv2Sho+yW8IFJrAaaW72q766SLuOnRl/ZGLM="; + "sha256-40dhkwxjCwZ9WkSTd+caFSgRVLGviC2scfJOK8PKk/k="; }; aarch64-linux = { - zuluVersion = "11.74.15"; - jdkVersion = "11.0.24"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-nAUjPk9gktO0UJk7gAKygq+ztSJY5wk+EoG1LgJidJ8=" + "sha256-yCispNSTxqPB8kg46tcDUWcjQQCn8bhtXM2w/oyrO54=" else - "sha256-T0c+YwfEZcA3iJmBriyzxBM2SECcczG25XVApIlgM+E="; + "sha256-j6ItLEU1W32zgfky+M2mD5WSmeKDYWfXnwzLOxRl8Ps="; }; x86_64-darwin = { - zuluVersion = "11.74.15"; - jdkVersion = "11.0.24"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-hanQw2FWbqsmGR1WixbM0BNWGeXmS2vt9tbaaEY7D1c=" + "sha256-slk4EU7Zl0cW2y2JBiCJ8yGs5h+cK2f81tRCgBOq5uA=" else - "sha256-CH6pVui0PInHMt+AJOE0T2hrAmEcLFRJvmR4KZuanaw="; + "sha256-+3OC3mQOo2ucJG0OACk7IJtTvTwPn5WPbcG5cT9DAAc="; }; aarch64-darwin = { - zuluVersion = "11.74.15"; - jdkVersion = "11.0.24"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-WbzpfPgoT3CTazKBnI1Fg+q+YQP6MwCWkon6VOeLZsA=" + "sha256-X1ph5yeqI2GZZTIGn93szk8Ks1ekJ9KaE3LSeUuigP0=" else - "sha256-+KxFgHbBDxN1O3NCAzqqBztxXveYAjrPFVuoFL/2dRQ="; + "sha256-/nViFbw2DKsHA8nIUffkbUdiWR3/MwEUIKcQ1JUOebE="; }; }; } diff --git a/pkgs/development/compilers/zulu/17.nix b/pkgs/development/compilers/zulu/17.nix index dd86c89ecd5e..fa68676e51b0 100644 --- a/pkgs/development/compilers/zulu/17.nix +++ b/pkgs/development/compilers/zulu/17.nix @@ -3,50 +3,49 @@ enableJavaFX ? false, ... }@args: - +let + zuluVersion = "17.66.19"; + jdkVersion = "17.0.19"; +in callPackage ./common.nix ( { # Details from https://www.azul.com/downloads/?version=java-17-lts&package=jdk # Note that the latest build may differ by platform dists = { x86_64-linux = { - zuluVersion = "17.64.17"; - jdkVersion = "17.0.18"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-jQ2ByIKtivoc9nJ/LPMZCktyjceqXY+B6a36sXmwUbE=" + "sha256-FCp5FoevH8ekD+AZhapvcqc8EpD08ubJ+UFCzwzDWJQ=" else - "sha256-gZ4/CepiiQGiGyEE7Y9SVuF66RpBRbJysushMfgyrx0="; + "sha256-rTGaq+ZZwY+mP620RgJqfH9SYPAqYVn1EZVzXSDnqhw="; }; aarch64-linux = { - zuluVersion = "17.64.17"; - jdkVersion = "17.0.18"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-ciyywX9R72RRt6HPfdmmsgFo/0ebr2xzNhnroAEDT7E=" + "sha256-NzY55vSha3gxmPS9dQK2827q8eAfkcfPXoiZ6KODpfQ=" else - "sha256-21fcnh+CIsL47604yMo2CxAR2Ln7m+oJVths1157Lb0="; + "sha256-wX1WV6ZzwM/AmenYA+0wSYSViU1zWf0QZNRjCT7ZhQs="; }; x86_64-darwin = { - zuluVersion = "17.64.17"; - jdkVersion = "17.0.18"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-td551xWmeHcD26J0gxboKS6Y3f5iLRhcUy97pfxhHxk=" + "sha256-3DHXEjYN9RXYD4sB/75/fATzPAwJmZv3D+PaSU8qrog=" else - "sha256-mHVhWicg6xAn8BaT4uCN93ChT8gYSYAfX7h7kRgdqyI="; + "sha256-anuLI/JBnqHd5+6s4NWkzF2+e7yDqN2jXcZKoSJp0EE="; }; aarch64-darwin = { - zuluVersion = "17.64.17"; - jdkVersion = "17.0.18"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-TnN+tPJ8HJSlZ0EUDq5SHo40EviO0iMX0P9eYHyRVP4=" + "sha256-szuMbtvi8wbKnbtwRjKIUQgb9LReDk6jCooECnpn6nM=" else - "sha256-EiRGuK028dyAZ3Jy29rXH9XKjXbfd0wB54Oce/TSZ9Y="; + "sha256-8r1a+qqkwj60vyx4kTx+t9PSKORCCf/sZS+3I4ii8lw="; }; }; } diff --git a/pkgs/development/compilers/zulu/21.nix b/pkgs/development/compilers/zulu/21.nix index cd9bbcb509a6..8ac8b68956a3 100644 --- a/pkgs/development/compilers/zulu/21.nix +++ b/pkgs/development/compilers/zulu/21.nix @@ -6,8 +6,8 @@ let # JDK FX can potentially be different version than regular JDK - zuluVersion = if enableJavaFX then "21.44.17" else "21.44.17"; - jdkVersion = "21.0.8"; + zuluVersion = if enableJavaFX then "21.50.19" else "21.50.19"; + jdkVersion = "21.0.11"; in callPackage ./common.nix ( { @@ -18,36 +18,36 @@ callPackage ./common.nix ( inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-T+bGfe0IoYwX1Odh66CdRL1fzbvA63NqM9e2hLCbx2Y=" + "sha256-YG9T25gv8n+LQ5yHPCNnpcv5D5/YVXj6jrB8AWqzbY4=" else - "sha256-Y/Vru0aVjPVzUvugjydV4JU3mRleVUWswMipKSC+/x4="; + "sha256-vF4zg0Mct/Hc6MJi3UdFAe6b11afHFmotv5cFYmqSlg="; }; aarch64-linux = { inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-6qFwo2rBV+mbEFDZNoqEs3z+2saj31fsOHG9jToST2Q=" + "sha256-yIcj1OeL2mGJwF0SYGYnuc03OvhpIupo/BC8qINnIUs=" else - "sha256-/38u3R1cFTy2y0k6OqNSNFPimgXsUTslwkqhR37AxyI="; + "sha256-zUvl6u1Q0rgUhd/iYOL6t+LJCoVL8Rt7+07raTZ1fEo="; }; x86_64-darwin = { inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-PGnYq+9MskgczsEjx4aH5yDYjZLw8Tk8IZSMOXw03aw=" + "sha256-5/L0FqpL6488uwzimXh9G6Io2cCTnU1+8n/6E+CNDK8=" else - "sha256-KvCAUAtcwoamNTGHx8WbWq/LPtwpwch9H9cbotalI/E="; + "sha256-kGmQy+WZcx48jshfem8uctSg+ewcwYtrUqFuHi/Fk00="; }; aarch64-darwin = { inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-Bj1cYFfm3dq+HB9tdnFwT7onVQ9Slf0zRFBK4z9LUoY=" + "sha256-XEKUQWG187kByQOTpQrD4aCFCo+MyeuGGY2UqDRq/WQ=" else - "sha256-0izgX+o+PyjIxZ8sNIvHjulnvxKJpPsoeWzAF3/2yNs="; + "sha256-Wc+JaVGh880TKr/B90uk2x+RbsyBs8ACLFwWohrpQK0="; }; }; } diff --git a/pkgs/development/compilers/zulu/25.nix b/pkgs/development/compilers/zulu/25.nix index 19808de0a0af..02565164dc60 100644 --- a/pkgs/development/compilers/zulu/25.nix +++ b/pkgs/development/compilers/zulu/25.nix @@ -6,7 +6,8 @@ let # For Zulu 25, FX and non-FX versions can differ - zuluVersion = if enableJavaFX then "25.28.85" else "25.28.85"; + zuluVersion = if enableJavaFX then "25.34.17" else "25.34.17"; + jdkVersion = "25.0.3"; in callPackage ./common.nix ( { @@ -14,43 +15,39 @@ callPackage ./common.nix ( # Note that the latest build may differ by platform dists = { x86_64-linux = { - inherit zuluVersion; - jdkVersion = "25.0.0"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-5Hhob86uCxrrdrFEvNaqPaQEaGrF47jpgUibKkNs1AQ=" + "sha256-gL7WgJFifVy3wYYqLFE13c7GZ6YMi3BVWhL+1+yTFN8=" else - "sha256-Fk2QHlokC4wYUW9atVvBH8lomrboKQRa6oRnNW3Ns0A="; + "sha256-OpMjX05bMTIyZHkWIZ6R3FzKC5g1ybUqQEuljENXFpc="; }; aarch64-linux = { - inherit zuluVersion; - jdkVersion = "25.0.0"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-HmfKOh0X2jcLrEMmKV81nQebtOOJjzpHWe1Ca+qIFYI=" + "sha256-K/vR9QBMbtW3KBePsoyIas9l64s6hf/uMuhAm53himE=" else - "sha256-tg651UyXukFZVHg0qYzF0BYoHdKz5g50dcukkRMkvLQ="; + "sha256-JhDlxk35TO5ftZHXAYPFv4Uy2OHTlMdU6LoGdRvM6xs="; }; x86_64-darwin = { - inherit zuluVersion; - jdkVersion = "25.0.0"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-J5Akv28y3XoJgw5q2Rh4xHv1AV1I33jnPslhxDrTc0E=" + "sha256-jOSgISihoNoGa5x8kBUpudCQi7Vj3O3H3jOG3W3UujA=" else - "sha256-ws3h0xPZBLeTw3YCFO76IH7Mp98E58QISr3x9rvrwno="; + "sha256-7MAFv3sSnANTeeDem+v9ZnvpMJj18eMpzUmMRnaRZ64="; }; aarch64-darwin = { - inherit zuluVersion; - jdkVersion = "25.0.0"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-urxxVoayeNW0g0g80eefmG+FMVzVBaBvmMKj+S3URNE=" + "sha256-/aWoDAXxCtXhGcsZCDjJe+hvIwHANZSw8NkBbjpgklk=" else - "sha256-c/ZPa618PfMfunQPvLu+98Glzt7/u13zht15vHKrqbY="; + "sha256-dIR+eskwrRQ5UGB0Id1sCnzLPRy72LFmXySrYri33kI="; }; }; } diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index fff0903db91c..8c34bd80dd05 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -3,50 +3,49 @@ enableJavaFX ? false, ... }@args: - +let + zuluVersion = "8.94.0.17"; + jdkVersion = "8.0.492"; +in callPackage ./common.nix ( { # Details from https://www.azul.com/downloads/?version=java-8-lts&package=jdk # Note that the latest build may differ by platform dists = { x86_64-linux = { - zuluVersion = "8.80.0.17"; - jdkVersion = "8.0.422"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-Ls2sHCtP9htBIDwq5fNDRA3/bGN0bzaMp6nNkjU1zx8=" + "sha256-/2LCORNb2xXPuQZkNgsN7rjZU/FW9j8SmbOe26jvdeU=" else - "sha256-YNxnNOFvTc0S3jt4F3UREi2196W7wSBmwieNJl7qamo="; + "sha256-ptFBBPLnGGy6iUPE3BgpONuRUJ3CwO+ezuBGyGRiTTY="; }; aarch64-linux = { - zuluVersion = "8.80.0.17"; - jdkVersion = "8.0.422"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-aVBleFrj4OpUJh82rM8XQGy9SzGqjaeOBo20nAbtpJo=" + "sha256-aoHwrAacHQA0yI7u3dBYu/oiRpYUQF1ZBwFErun6Wd8=" else - "sha256-C5ebWtKAyKexOuEf4yM1y5tQZ2ICxREObwvMrcz5TXE="; + "sha256-JPXoGDpS77WrzuK4FzsIhwibp0dvEbwVYDRkNTzE5Kg="; }; x86_64-darwin = { - zuluVersion = "8.80.0.17"; - jdkVersion = "8.0.422"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-7NB0OH194nZdpIGyX8gLxJzjJdi2UIxmGsGI5M0yqJ4=" + "sha256-5r2/yl4xHjLpaakRZ/khICGxUaoKk1GDvPJ56pliIwc=" else - "sha256-vyB1Fepnpwsi9KjwFjEF+YbiCgmqZcirZu0zmRAp8PA="; + "sha256-URSyabiOPYmw1rLCivDJa1SJ80D7re2PoXYTsq3KGAw="; }; aarch64-darwin = { - zuluVersion = "8.80.0.17"; - jdkVersion = "8.0.422"; + inherit zuluVersion jdkVersion; hash = if enableJavaFX then - "sha256-JuQkY923tizx5HQo4WC3YCk75a4qHJYNRFKpZ8XES58=" + "sha256-RluOwTuXKtAa8pyYFf8fpj2ApgPzuuG/HmSppRdqbR0=" else - "sha256-Q/hU2ICVwmJehrXmACm4/X48ULTqM6WSc55JDVgkBvM="; + "sha256-c7hKv/DKShtki2zRI4EZRJa88x7gHyvdHtCRTJ7loVk="; }; }; } diff --git a/pkgs/development/compilers/zulu/common.nix b/pkgs/development/compilers/zulu/common.nix index 11ba01f75b58..46724ffea83c 100644 --- a/pkgs/development/compilers/zulu/common.nix +++ b/pkgs/development/compilers/zulu/common.nix @@ -125,9 +125,9 @@ let mv * $out '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Library/Java/JavaVirtualMachines bundle=$out/Library/Java/JavaVirtualMachines/zulu-${lib.versions.major version}.jdk - mv $out/zulu-${lib.versions.major version}.jdk $bundle + mkdir -p $bundle + mv $out/Contents $bundle ln -sf $bundle/Contents/Home/* $out/ '' + ''