diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index 6f398c453c624..a5c5d6f9ffb87 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -6,7 +6,7 @@ import requests import sys -feature_versions = (8, 11, 17, 21, 22, 23) +feature_versions = (8, 11, 17, 21, 23) 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 76c9aa3320013..8363905118f8e 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -19,9 +19,6 @@ in jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; - jdk-22 = common { sourcePerArch = sources.jdk.openjdk22; }; - jre-22 = common { sourcePerArch = sources.jre.openjdk22; }; - jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; }; jre-23 = common { sourcePerArch = sources.jre.openjdk23; }; } diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index 54a233590fe7d..2c633f150fdb0 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -20,9 +20,6 @@ in jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; - jdk-22 = common { sourcePerArch = sources.jdk.openjdk22; }; - jre-22 = common { sourcePerArch = sources.jre.openjdk22; }; - jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; }; jre-23 = common { sourcePerArch = sources.jre.openjdk23; }; } diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index 75ce8dfb0ae6c..9443eb45f401d 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -38,22 +38,6 @@ "version": "21.0.4" } }, - "openjdk22": { - "aarch64": { - "build": "9", - "sha256": "8ac93a2d5a55aabbc0f7156c2f9032026e87c185689d628ef8a4184b6e9ab006", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_aarch64_alpine-linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "49f73414824b1a7c268a611225fa4d7ce5e25600201e0f1cd59f94d1040b5264", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_alpine-linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - } - }, "openjdk23": { "aarch64": { "build": "37", @@ -118,22 +102,6 @@ "version": "21.0.4" } }, - "openjdk22": { - "aarch64": { - "build": "9", - "sha256": "749e7372a7dba0de632592fe55a0e387d96922c84dcdc039e0efc1f7ecfcd70e", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_aarch64_alpine-linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "459342f5210cfd185aeed05abdc052fcd61cf6ff066541919b786236d69c5737", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_alpine-linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - } - }, "openjdk23": { "aarch64": { "build": "37", @@ -266,34 +234,6 @@ "version": "21.0.4" } }, - "openjdk22": { - "aarch64": { - "build": "9", - "sha256": "dac62747b5158c4bf4c4636432e3bdb9dea47f80f0c9d1d007f19bd5483b7d29", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_aarch64_linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "9", - "sha256": "1d678752d58e33ff951e75736b8415d6d7ae136b2421ca02e993f2603e9b259b", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_ppc64le_linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - }, - "riscv64": { - "build": "9", - "sha256": "830a0d006c2dae95c0855aa70e193dba637831b491ccd67333322dea31bcf389", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_riscv64_linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "05cd9359dacb1a1730f7c54f57e0fed47942a5292eb56a3a0ee6b13b87457a43", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - } - }, "openjdk23": { "aarch64": { "build": "37", @@ -460,34 +400,6 @@ "version": "21.0.4" } }, - "openjdk22": { - "aarch64": { - "build": "9", - "sha256": "7cf494b51625505d1843ad032677d885bd8000a80d0d38396685f25acbdb5708", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_aarch64_linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - }, - "packageType": "jre", - "powerpc64le": { - "build": "9", - "sha256": "132191d6f23ad1ac558de67e3e9913d047db07efd979eb84bf5dc20a651ffe61", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_ppc64le_linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - }, - "riscv64": { - "build": "9", - "sha256": "81aacc0ae75e65846e6207edf41b8c5927673eba5588eebc5ba8076ca9a6041c", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_riscv64_linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "41e401f287e1850631b259b483929462217ac6b1cc3c7359d80b1cc01ee5a666", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - } - }, "openjdk23": { "aarch64": { "build": "37", @@ -602,22 +514,6 @@ "version": "21.0.4" } }, - "openjdk22": { - "aarch64": { - "build": "9", - "sha256": "6f7bd166c46094cf48018b018b161eae838a01dddce9d6fc5800eed353d37b84", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_aarch64_mac_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "f3f411a4c685699980ad0ef2cac994d0450fc40d4a75d3d16b73857f76c9a982", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_mac_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - } - }, "openjdk23": { "aarch64": { "build": "37", @@ -694,22 +590,6 @@ "version": "21.0.4" } }, - "openjdk22": { - "aarch64": { - "build": "9", - "sha256": "d1b72dcf7a5d18b9b394acb7a64667eb089a82c8112214fb5d1e5a24a4b09202", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_aarch64_mac_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "ab0fe9b4cd5c38ea1ceb1c675b1722d510038f657f79ce97a811b3d13d3882a6", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_mac_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" - } - }, "openjdk23": { "aarch64": { "build": "37", diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 022452aab4bb1..ee39bb44c4774 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1548,6 +1548,8 @@ mapAliases { temurin-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-jre-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-bin-16 = throw "Temurin 16 has been removed as it has reached its end of life"; # Added 2024-08-01 + temurin-jre-bin-22 = throw "Temurin 22 has been removed as it has reached its end of life"; # Added 2024-09-24 + temurin-bin-22 = throw "Temurin 22 has been removed as it has reached its end of life"; # Added 2024-09-24 tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08 tepl = libgedit-tepl; # Added 2024-04-29 testVersion = testers.testVersion; # Added 2022-04-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0427d35b4a64c..cbdc47c0db6d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14391,9 +14391,6 @@ with pkgs; temurin-bin-23 = javaPackages.compiler.temurin-bin.jdk-23; temurin-jre-bin-23 = javaPackages.compiler.temurin-bin.jre-23; - temurin-bin-22 = javaPackages.compiler.temurin-bin.jdk-22; - temurin-jre-bin-22 = javaPackages.compiler.temurin-bin.jre-22; - temurin-bin-21 = javaPackages.compiler.temurin-bin.jdk-21; temurin-jre-bin-21 = javaPackages.compiler.temurin-bin.jre-21;