diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 967612619a73..6c60fc5c490d 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 000000000000..d9309d9ce0b0 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix @@ -0,0 +1,9 @@ +{ lib }: + +let + sources = lib.importJSON ./sources.json; +in +{ + jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jdk.hotspot; }; + jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jre.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 000000000000..f162d8d29687 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix @@ -0,0 +1,9 @@ +{ lib }: + +let + sources = lib.importJSON ./sources.json; +in +{ + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jdk.hotspot; }; + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jre.hotspot; }; +} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 80b3d1709cde..7738e4101628 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -793,6 +793,108 @@ } } }, + "openjdk17": { + "linux": { + "jdk": { + "hotspot": { + "aarch64": { + "build": "8", + "sha256": "302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz", + "version": "17.0.2" + }, + "armv6l": { + "build": "8", + "sha256": "544936145a4a9b1a316ed3708cd91b3960d5e8e87578bea73ef674ca3047158e", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz", + "version": "17.0.2" + }, + "armv7l": { + "build": "8", + "sha256": "544936145a4a9b1a316ed3708cd91b3960d5e8e87578bea73ef674ca3047158e", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz", + "version": "17.0.2" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz", + "version": "17.0.2" + } + } + }, + "jre": { + "hotspot": { + "aarch64": { + "build": "8", + "sha256": "6ef7a28d0d844fe347ab18f65a91db744547321fe8a101d883bd80722183ab64", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.2_8.tar.gz", + "version": "17.0.2" + }, + "armv6l": { + "build": "8", + "sha256": "4fd1d11f3008aba1c6c17e1d1c1cf15e2a54e68275ad0874b47a781eaf73450e", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.2_8.tar.gz", + "version": "17.0.2" + }, + "armv7l": { + "build": "8", + "sha256": "4fd1d11f3008aba1c6c17e1d1c1cf15e2a54e68275ad0874b47a781eaf73450e", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.2_8.tar.gz", + "version": "17.0.2" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "292ed702d95f5690e52e171afe9f3050b9d2fb803456b155c831735fad0f17c0", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_x64_linux_hotspot_17.0.2_8.tar.gz", + "version": "17.0.2" + } + } + } + }, + "mac": { + "jdk": { + "hotspot": { + "aarch64": { + "build": "8", + "sha256": "157518e999d712b541b883c6c167f8faabbef1d590da9fe7233541b4adb21ea4", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.2_8.tar.gz", + "version": "17.0.2" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "3630e21a571b7180876bf08f85d0aac0bdbb3267b2ae9bd242f4933b21f9be32", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz", + "version": "17.0.2" + } + } + }, + "jre": { + "hotspot": { + "aarch64": { + "build": "8", + "sha256": "f2f23d6629060eb1692c714bfda27dd5f100cc560578c7cdd9df920a8ac1d453", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.2_8.tar.gz", + "version": "17.0.2" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "4e2e5e9c079ccc48b056959b2808a96398ebbc92d6b13ee5beb3159b89469aa8", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_x64_mac_hotspot_17.0.2_8.tar.gz", + "version": "17.0.2" + } + } + } + } + }, "openjdk8": { "linux": { "jdk": { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e35d9a37baba..e896f748133a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12970,6 +12970,16 @@ 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-jre-hotspot-bin-17 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-17-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-17-packages-darwin.jre-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; }; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 160f51cf43c5..2ac6c2735e98 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -90,6 +90,10 @@ in { ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix; + adoptopenjdk-17 = mkAdoptopenjdk + ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix + ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix; + openjdk8-bootstrap = mkBootstrap adoptopenjdk-8 ../development/compilers/openjdk/bootstrap.nix { version = "8"; };