From f06ca8867699bf94da904d7f579050e7c5395b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= Date: Tue, 8 Apr 2025 10:54:42 +0200 Subject: [PATCH] temurin-{,jre-}bin-24: init at 24.0.0 --- .../compilers/temurin-bin/generate-sources.py | 2 +- .../compilers/temurin-bin/jdk-darwin.nix | 3 + .../compilers/temurin-bin/jdk-linux.nix | 3 + .../compilers/temurin-bin/sources.json | 120 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 5 files changed, 130 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index a5c5d6f9ffb8..9a4e75dcb4fc 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -feature_versions = (8, 11, 17, 21, 23) +feature_versions = (8, 11, 17, 21, 23, 24) oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") impls = ("hotspot",) diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index 1f5c42d75032..e9509c847fa6 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -21,4 +21,7 @@ in jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; }; jre-23 = common { sourcePerArch = sources.jre.openjdk23; }; + + jdk-24 = common { sourcePerArch = sources.jdk.openjdk24; }; + jre-24 = common { sourcePerArch = sources.jre.openjdk24; }; } diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index 4ed06b98198b..f66f3f6c705a 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -26,4 +26,7 @@ in jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; }; jre-23 = common { sourcePerArch = sources.jre.openjdk23; }; + + jdk-24 = common { sourcePerArch = sources.jdk.openjdk24; }; + jre-24 = common { sourcePerArch = sources.jre.openjdk24; }; } diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index ab1757d9dc8d..107a34419b07 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -54,6 +54,22 @@ "version": "23.0.2" } }, + "openjdk24": { + "aarch64": { + "build": "36", + "sha256": "4a673456aa6e726b86108a095a21868b7ebcdde050a92b3073d50105ff92f07f", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_aarch64_alpine-linux_hotspot_24_36.tar.gz", + "version": "24.0.0" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "a642608f0da78344ee6812fb1490b8bc1d7ad5a18064c70994d6f330568c51cb", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_alpine-linux_hotspot_24_36.tar.gz", + "version": "24.0.0" + } + }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", @@ -118,6 +134,22 @@ "version": "23.0.2" } }, + "openjdk24": { + "aarch64": { + "build": "36", + "sha256": "0bc8181c7e85d55bba652503db62e60846439f279271d583b740ac70f9f5ae87", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_aarch64_alpine-linux_hotspot_24_36.tar.gz", + "version": "24.0.0" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "0f738719d0483d6fe7f08a1371d1c696d68dcfe39f073b4241673f35ffc8d655", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_x64_alpine-linux_hotspot_24_36.tar.gz", + "version": "24.0.0" + } + }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", @@ -262,6 +294,34 @@ "version": "23.0.2" } }, + "openjdk24": { + "aarch64": { + "build": "36", + "sha256": "18071047526ab4b53131f9bb323e8703485ae37fcb2f2c5ef0f1b7bab66d1b94", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_aarch64_linux_hotspot_24_36.tar.gz", + "version": "24.0.0" + }, + "packageType": "jdk", + "powerpc64le": { + "build": "36", + "sha256": "3a5641ab862a2bbae56886d4ec47f735052780bfe124df7aea2ca40e0f973b5a", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_ppc64le_linux_hotspot_24_36.tar.gz", + "version": "24.0.0" + }, + "riscv64": { + "build": "36", + "sha256": "a1d993ab0b4b80101ec2e2452bdd37735572b734c255576a47c5130eab55f09a", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_riscv64_linux_hotspot_24_36.tar.gz", + "version": "24.0.0" + }, + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "c340dee97b6aa215d248bc196dcac5b56e7be9b5c5d45e691344d40d5d0b171d", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_linux_hotspot_24_36.tar.gz", + "version": "24.0.0" + } + }, "openjdk8": { "aarch64": { "build": "6", @@ -428,6 +488,34 @@ "version": "23.0.2" } }, + "openjdk24": { + "aarch64": { + "build": "36", + "sha256": "782a46008490272affe0b797155c2ae8e759e10c8ba4540f1f7285ef3d2902de", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_aarch64_linux_hotspot_24_36.tar.gz", + "version": "24.0.0" + }, + "packageType": "jre", + "powerpc64le": { + "build": "36", + "sha256": "e7c90ab80d5e9419f794aee63c8f1bf3ed29e656d4e8e967a45d3069bd643c07", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_ppc64le_linux_hotspot_24_36.tar.gz", + "version": "24.0.0" + }, + "riscv64": { + "build": "36", + "sha256": "3a670b2116cfc7e806ebccf6ad3b5601936581afc666587653c47e642c0acf19", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_riscv64_linux_hotspot_24_36.tar.gz", + "version": "24.0.0" + }, + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "e8d8f5707d765a6bfca3de61320e0bb2618191c77947bc467ac5021e6193f351", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_x64_linux_hotspot_24_36.tar.gz", + "version": "24.0.0" + } + }, "openjdk8": { "aarch64": { "build": "6", @@ -530,6 +618,22 @@ "version": "23.0.2" } }, + "openjdk24": { + "aarch64": { + "build": "36", + "sha256": "8e343d2aaa1d00fdee351d392a4a3f537d81fa4a36f5fdf05e2e2c26d5c50af9", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_aarch64_mac_hotspot_24_36.tar.gz", + "version": "24.0.0" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "07a99d4a81c4d5e0c4936bf4b9f901565213781c67e865f304a8d8eb75e880d8", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_mac_hotspot_24_36.tar.gz", + "version": "24.0.0" + } + }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", @@ -606,6 +710,22 @@ "version": "23.0.2" } }, + "openjdk24": { + "aarch64": { + "build": "36", + "sha256": "fa9783caf9298b7e927b4589435257cf9a2cf12e1eb915992911b988f3d310bc", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_aarch64_mac_hotspot_24_36.tar.gz", + "version": "24.0.0" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "10b2a32a5544c03a4bf36f12efc3a770bb789be20ff3c9edf85102c5879479de", + "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jre_x64_mac_hotspot_24_36.tar.gz", + "version": "24.0.0" + } + }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf74c35eb2bf..dcaf45ad112a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5807,6 +5807,9 @@ with pkgs; ### DEVELOPMENT / COMPILERS + temurin-bin-24 = javaPackages.compiler.temurin-bin.jdk-24; + temurin-jre-bin-24 = javaPackages.compiler.temurin-bin.jre-24; + temurin-bin-23 = javaPackages.compiler.temurin-bin.jdk-23; temurin-jre-bin-23 = javaPackages.compiler.temurin-bin.jre-23;