commit b6cb656c0d897050f2487e7fda9d14ebf88e0405 · pyrox.dev/nixpkgs

+1 -1

pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py

··· 6 import requests 7 import sys 8 9 - releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16") 10 oses = ("mac", "linux") 11 types = ("jre", "jdk") 12 impls = ("hotspot", "openj9")

··· 6 import requests 7 import sys 8 9 + releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16", "openjdk17") 10 oses = ("mac", "linux") 11 types = ("jre", "jdk") 12 impls = ("hotspot", "openj9")

+9

pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix

···

··· 1 + { lib }: 2 + 3 + let 4 + sources = lib.importJSON ./sources.json; 5 + in 6 + { 7 + jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jdk.hotspot; }; 8 + jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jre.hotspot; }; 9 + }

+9

pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix

···

··· 1 + { lib }: 2 + 3 + let 4 + sources = lib.importJSON ./sources.json; 5 + in 6 + { 7 + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jdk.hotspot; }; 8 + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jre.hotspot; }; 9 + }

+102

pkgs/development/compilers/adoptopenjdk-bin/sources.json

··· 793 } 794 } 795 }, 796 "openjdk8": { 797 "linux": { 798 "jdk": {

··· 793 } 794 } 795 }, 796 + "openjdk17": { 797 + "linux": { 798 + "jdk": { 799 + "hotspot": { 800 + "aarch64": { 801 + "build": "8", 802 + "sha256": "302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200", 803 + "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", 804 + "version": "17.0.2" 805 + }, 806 + "armv6l": { 807 + "build": "8", 808 + "sha256": "544936145a4a9b1a316ed3708cd91b3960d5e8e87578bea73ef674ca3047158e", 809 + "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", 810 + "version": "17.0.2" 811 + }, 812 + "armv7l": { 813 + "build": "8", 814 + "sha256": "544936145a4a9b1a316ed3708cd91b3960d5e8e87578bea73ef674ca3047158e", 815 + "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", 816 + "version": "17.0.2" 817 + }, 818 + "packageType": "jdk", 819 + "vmType": "hotspot", 820 + "x86_64": { 821 + "build": "8", 822 + "sha256": "288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48", 823 + "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", 824 + "version": "17.0.2" 825 + } 826 + } 827 + }, 828 + "jre": { 829 + "hotspot": { 830 + "aarch64": { 831 + "build": "8", 832 + "sha256": "6ef7a28d0d844fe347ab18f65a91db744547321fe8a101d883bd80722183ab64", 833 + "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", 834 + "version": "17.0.2" 835 + }, 836 + "armv6l": { 837 + "build": "8", 838 + "sha256": "4fd1d11f3008aba1c6c17e1d1c1cf15e2a54e68275ad0874b47a781eaf73450e", 839 + "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", 840 + "version": "17.0.2" 841 + }, 842 + "armv7l": { 843 + "build": "8", 844 + "sha256": "4fd1d11f3008aba1c6c17e1d1c1cf15e2a54e68275ad0874b47a781eaf73450e", 845 + "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", 846 + "version": "17.0.2" 847 + }, 848 + "packageType": "jre", 849 + "vmType": "hotspot", 850 + "x86_64": { 851 + "build": "8", 852 + "sha256": "292ed702d95f5690e52e171afe9f3050b9d2fb803456b155c831735fad0f17c0", 853 + "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", 854 + "version": "17.0.2" 855 + } 856 + } 857 + } 858 + }, 859 + "mac": { 860 + "jdk": { 861 + "hotspot": { 862 + "aarch64": { 863 + "build": "8", 864 + "sha256": "157518e999d712b541b883c6c167f8faabbef1d590da9fe7233541b4adb21ea4", 865 + "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", 866 + "version": "17.0.2" 867 + }, 868 + "packageType": "jdk", 869 + "vmType": "hotspot", 870 + "x86_64": { 871 + "build": "8", 872 + "sha256": "3630e21a571b7180876bf08f85d0aac0bdbb3267b2ae9bd242f4933b21f9be32", 873 + "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", 874 + "version": "17.0.2" 875 + } 876 + } 877 + }, 878 + "jre": { 879 + "hotspot": { 880 + "aarch64": { 881 + "build": "8", 882 + "sha256": "f2f23d6629060eb1692c714bfda27dd5f100cc560578c7cdd9df920a8ac1d453", 883 + "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", 884 + "version": "17.0.2" 885 + }, 886 + "packageType": "jre", 887 + "vmType": "hotspot", 888 + "x86_64": { 889 + "build": "8", 890 + "sha256": "4e2e5e9c079ccc48b056959b2808a96398ebbc92d6b13ee5beb3159b89469aa8", 891 + "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", 892 + "version": "17.0.2" 893 + } 894 + } 895 + } 896 + } 897 + }, 898 "openjdk8": { 899 "linux": { 900 "jdk": {

+10

pkgs/top-level/all-packages.nix

··· 12970 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 12971 }; 12972 12973 adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix { inherit lib; }; 12974 adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix { inherit lib; }; 12975

··· 12970 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 12971 }; 12972 12973 + adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit lib; }; 12974 + adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; }; 12975 + 12976 + adoptopenjdk-hotspot-bin-17 = if stdenv.isLinux 12977 + then callPackage adoptopenjdk-bin-17-packages-linux.jdk-hotspot {} 12978 + else callPackage adoptopenjdk-bin-17-packages-darwin.jdk-hotspot {}; 12979 + adoptopenjdk-jre-hotspot-bin-17 = if stdenv.isLinux 12980 + then callPackage adoptopenjdk-bin-17-packages-linux.jre-hotspot {} 12981 + else callPackage adoptopenjdk-bin-17-packages-darwin.jre-hotspot {}; 12982 + 12983 adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix { inherit lib; }; 12984 adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix { inherit lib; }; 12985

+4

pkgs/top-level/java-packages.nix

··· 90 ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix 91 ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix; 92 93 openjdk8-bootstrap = mkBootstrap adoptopenjdk-8 94 ../development/compilers/openjdk/bootstrap.nix 95 { version = "8"; };

··· 90 ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix 91 ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix; 92 93 + adoptopenjdk-17 = mkAdoptopenjdk 94 + ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix 95 + ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix; 96 + 97 openjdk8-bootstrap = mkBootstrap adoptopenjdk-8 98 ../development/compilers/openjdk/bootstrap.nix 99 { version = "8"; };