diff options
author | Timothy <git@timothyklim.com> | 2021-10-01 12:02:04 +0700 |
---|---|---|
committer | taku0 <mxxouy6x3m_github@tatapa.org> | 2022-07-02 14:05:19 +0900 |
commit | ee9eec33539e1e2961334374b5ae1f7560ea871b (patch) | |
tree | b923357629e1a97fb8e810d75996853a9e410fec | |
parent | 1d6059cbd54cffb30cddf63ff7526a4700cd4295 (diff) | |
download | nixpkgs-ee9eec33539e1e2961334374b5ae1f7560ea871b.tar nixpkgs-ee9eec33539e1e2961334374b5ae1f7560ea871b.tar.gz nixpkgs-ee9eec33539e1e2961334374b5ae1f7560ea871b.tar.bz2 nixpkgs-ee9eec33539e1e2961334374b5ae1f7560ea871b.tar.lz nixpkgs-ee9eec33539e1e2961334374b5ae1f7560ea871b.tar.xz nixpkgs-ee9eec33539e1e2961334374b5ae1f7560ea871b.tar.zst nixpkgs-ee9eec33539e1e2961334374b5ae1f7560ea871b.zip |
adoptopenjdk: add 17.0.1
5 files changed, 78 insertions, 1 deletions
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 967612619a7..6c60fc5c490 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16") +releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16", "openjdk17") oses = ("mac", "linux") types = ("jre", "jdk") impls = ("hotspot", "openj9") diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix new file mode 100644 index 00000000000..7f211ac1f1e --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix @@ -0,0 +1,8 @@ +{ 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 new file mode 100644 index 00000000000..f1bd072bc92 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix @@ -0,0 +1,8 @@ +{ 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 80b3d1709cd..3b93a26c158 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -793,6 +793,60 @@ } } }, + "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": { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 432f56dd83c..6bccca1c9ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12388,6 +12388,13 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit lib; }; + adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; }; + + adoptopenjdk-hotspot-bin-17 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-17-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-17-packages-darwin.jdk-hotspot {}; + adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix { inherit lib; }; adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix { inherit lib; }; |