diff options
author | taku0 <mxxouy6x3m_github@tatapa.org> | 2021-10-03 20:45:43 +0900 |
---|---|---|
committer | taku0 <mxxouy6x3m_github@tatapa.org> | 2022-09-12 16:29:36 +0900 |
commit | c74221839b5e20a1260a77a9823ab7d3d9d1a5fa (patch) | |
tree | 0d47c71202cea7052c1db2c41bbaa515387b717c /pkgs/development/compilers/adoptopenjdk-bin | |
parent | ee9eec33539e1e2961334374b5ae1f7560ea871b (diff) |
temurin-bin, semeru-bin: init at 17.0.3, adoptopenjdk-bin: remove 13, 14, 17
AdoptOpenJDK Hotspot is now Eclipse Temurin and AdoptOpenJDK OpenJ9 is
now IBM Semeru Runtime.
Adds `temurin-bin` and `semeru-bin` packages.
AdoptOpenJDK 13, 14, and 15 is no longer supported. AdoptOpenJDK 13 and
14 are removed. AdoptOpenJDK 15 is left only for some packages
depending it.
Diffstat (limited to 'pkgs/development/compilers/adoptopenjdk-bin')
4 files changed, 3 insertions, 72 deletions
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 6c60fc5c490d..a4ad5932ae0b 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -6,7 +6,8 @@ import re import requests import sys -releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16", "openjdk17") +# openjdk15 is only for bootstrapping openjdk +releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16") oses = ("mac", "linux") types = ("jre", "jdk") impls = ("hotspot", "openj9") @@ -21,7 +22,7 @@ arch_to_nixos = { def get_sha256(url): resp = requests.get(url) if resp.status_code != 200: - print("error: could not fetch checksum from url {}: code {}".format(url, resp.code), file=sys.stderr) + print("error: could not fetch checksum from url {}: code {}".format(url, resp.status_code), file=sys.stderr) sys.exit(1) return resp.text.strip().split(" ")[0] diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix deleted file mode 100644 index 7f211ac1f1e1..000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib }: - -let - sources = lib.importJSON ./sources.json; -in -{ - jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jdk.hotspot; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix deleted file mode 100644 index f1bd072bc929..000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib }: - -let - sources = lib.importJSON ./sources.json; -in -{ - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jdk.hotspot; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 3b93a26c158d..80b3d1709cde 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -793,60 +793,6 @@ } } }, - "openjdk17": { - "linux": { - "jdk": { - "hotspot": { - "aarch64": { - "build": "12", - "sha256": "f23d482b2b4ada08166201d1a0e299e3e371fdca5cd7288dcbd81ae82f3a75e3", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.1_12.tar.gz", - "version": "17.0.1" - }, - "armv6l": { - "build": "12", - "sha256": "f5945a39929384235e7cb1c57df071b8c7e49274632e2a54e54b2bad05de21a5", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_arm_linux_hotspot_17.0.1_12.tar.gz", - "version": "17.0.1" - }, - "armv7l": { - "build": "12", - "sha256": "f5945a39929384235e7cb1c57df071b8c7e49274632e2a54e54b2bad05de21a5", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_arm_linux_hotspot_17.0.1_12.tar.gz", - "version": "17.0.1" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "12", - "sha256": "6ea18c276dcbb8522feeebcfc3a4b5cb7c7e7368ba8590d3326c6c3efc5448b6", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz", - "version": "17.0.1" - } - } - } - }, - "mac": { - "jdk": { - "hotspot": { - "aarch64": { - "build": "12", - "sha256": "02073590da24421e119ddebe6b061bf132fa68694c60706f092d32d963822554", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.1_12.tar.gz", - "version": "17.0.1" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "12", - "sha256": "98a759944a256dbdd4d1113459c7638501f4599a73d06549ac309e1982e2fa70", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_mac_hotspot_17.0.1_12.tar.gz", - "version": "17.0.1" - } - } - } - } - }, "openjdk8": { "linux": { "jdk": { |