git.iko.soy/typeable/nixpkgs
on master help sign in
adoptopenjdk: autogenerate sources + add support for aarch64
commit5bbfc0cc37f5f9b607678102883c6f1156abc305 authorBenno Fünfstück <benno.fuenfstueck@gmail.com> dateMon 17 Dec 2018, 23:08 (8 years ago) parentda09302
6 files changed+184−91
pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py+69 pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix+5−6 pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix+6−7 pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix+5−39 pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix+5−39 pkgs/development/compilers/adoptopenjdk-bin/sources.json+94
pkgs/development/compilers/adoptopenjdk-bin/generate-sources.pynew file+69
@@ -0,0 +1,69 @@
1+#!/usr/bin/env nix-shell
2+#!nix-shell --pure -i python3 -p python3 -p python3Packages.requests
3+
4+import json
5+import re
6+import requests
7+import sys
8+
9+releases = ["openjdk11"]
10+oses = ["mac", "linux"]
11+types = ["jre", "jdk"]
12+impls = ["hotspot", "openj9"]
13+
14+arch_to_nixos = {
15+ "x64": "x86_64",
16+ "aarch64": "aarch64",
17+}
18+
19+def get_sha256(url):
20+ resp = requests.get(url)
21+ if resp.status_code != 200:
22+ print("error: could not fetch checksum from url {}: code {}".format(url, resp.code), file=sys.stderr)
23+ sys.exit(1)
24+ return resp.text.strip().split(" ")[0]
25+
26+RE_RELEASE_NAME = re.compile(r'[^-]+-([0-9.]+)\+([0-9]+)') # example release name: jdk-11.0.1+13
27+def generate_sources(release, assets):
28+ out = {}
29+ for asset in assets:
30+ if asset["os"] not in oses: continue
31+ if asset["binary_type"] not in types: continue
32+ if asset["openjdk_impl"] not in impls: continue
33+ if asset["heap_size"] != "normal": continue
34+ if asset["architecture"] not in arch_to_nixos: continue
35+
36+ version, build = RE_RELEASE_NAME.match(asset["release_name"]).groups()
37+
38+ type_map = out.setdefault(asset["os"], {})
39+ impl_map = type_map.setdefault(asset["binary_type"], {})
40+ arch_map = impl_map.setdefault(asset["openjdk_impl"], {
41+ "version": version,
42+ "build": build,
43+ "packageType": asset["binary_type"],
44+ "vmType": asset["openjdk_impl"],
45+ })
46+
47+ if arch_map["version"] != version or arch_map["build"] != build:
48+ print("error: architectures have different latest versions ({}+{} vs {}+{})".format(
49+ arch_map["version"], arch_map["build"], version, build
50+ ), file=sys.stderr)
51+ sys.exit(1)
52+
53+ arch_map[arch_to_nixos[asset["architecture"]]] = {
54+ "url": asset["binary_link"],
55+ "sha256": get_sha256(asset["checksum_link"]),
56+ }
57+
58+ return out
59+
60+out = {}
61+for release in releases:
62+ resp = requests.get("https://api.adoptopenjdk.net/v2/latestAssets/releases/" + release)
63+ if resp.status_code != 200:
64+ print("error: could not fetch data for release {} (code {})".format(release, resp.code), file=sys.stderr)
65+ sys.exit(1)
66+ out[release] = generate_sources(release, resp.json())
67+
68+with open("sources.json", "w") as f:
69+ json.dump(out, f, indent=2, sort_keys=True)
pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix+5−6
@@ -1,7 +1,4 @@
1−{ name
2−, url
3−, sha256
4−}:
1+sourcePerArch:
52
63{ swingSupport ? true # not used for now
74, stdenv
@@ -9,10 +6,12 @@
96}:
107
118let result = stdenv.mkDerivation rec {
12− inherit name;
9+ name = if sourcePerArch.packageType == "jdk"
10+ then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
11+ else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
1312
1413 src = fetchurl {
15− inherit url sha256;
14+ inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
1615 };
1716
1817 # See: https://github.com/NixOS/patchelf/issues/10
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix+6−7
@@ -1,7 +1,4 @@
1−{ name
2−, url
3−, sha256
4−}:
1+sourcePerArch:
52
63{ swingSupport ? true
74, stdenv
@@ -48,10 +45,12 @@ let
4845in
4946
5047let result = stdenv.mkDerivation rec {
51− inherit name;
48+ name = if sourcePerArch.packageType == "jdk"
49+ then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
50+ else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
5251
5352 src = fetchurl {
54− inherit url sha256;
53+ inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
5554 };
5655
5756 nativeBuildInputs = [ file ];
@@ -112,7 +111,7 @@ let result = stdenv.mkDerivation rec {
112111 meta = with stdenv.lib; {
113112 license = licenses.gpl2Classpath;
114113 description = "AdoptOpenJDK, prebuilt OpenJDK binary";
115− platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
114+ platforms = stdenv.lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
116115 maintainers = with stdenv.lib.maintainers; [ taku0 ];
117116 };
118117
pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix+5−39
@@ -1,43 +1,9 @@
11let
2− makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-darwin-base.nix {
3− name = if packageType == "jdk"
4− then
5− "adoptopenjdk-${vmType}-bin-${version}"
6− else
7− "adoptopenjdk-${packageType}-${vmType}-bin-${version}";
8−
9− url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz";
10−
11− inherit sha256;
12− };
2+ sources = builtins.fromJSON (builtins.readFile ./sources.json);
133in
144{
15− jdk-hotspot = makePackage {
16− version = "11";
17− buildNumber = "28";
18− packageType = "jdk";
19− vmType = "hotspot";
20− sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3";
21− };
22− jre-hotspot = makePackage {
23− version = "11";
24− buildNumber = "28";
25− packageType = "jre";
26− vmType = "hotspot";
27− sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c";
28− };
29− jdk-openj9 = makePackage {
30− version = "11.0.1";
31− buildNumber = "13";
32− packageType = "jdk";
33− vmType = "openj9";
34− sha256 = "c5e9b588b4ac5b0bd5b4edd69d59265d1199bb98af7ca3270e119b264ffb6e3f";
35− };
36− jre-openj9 = makePackage {
37− version = "11.0.1";
38− buildNumber = "13";
39− packageType = "jre";
40− vmType = "openj9";
41− sha256 = "0901dc5946fdf967f92f7b719ddfffdcdde5bd3fef86a83d7a3f2f39ddbef1f8";
42− };
5+ jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot;
6+ jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot;
7+ jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9;
8+ jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
439}
pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix+5−39
@@ -1,43 +1,9 @@
11let
2− makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-linux-base.nix {
3− name = if packageType == "jdk"
4− then
5− "adoptopenjdk-${vmType}-bin-${version}"
6− else
7− "adoptopenjdk-${packageType}-${vmType}-bin-${version}";
8−
9− url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz";
10−
11− inherit sha256;
12− };
2+ sources = builtins.fromJSON (builtins.readFile ./sources.json);
133in
144{
15− jdk-hotspot = makePackage {
16− version = "11";
17− buildNumber = "28";
18− packageType = "jdk";
19− vmType = "hotspot";
20− sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af";
21− };
22− jre-hotspot = makePackage {
23− version = "11";
24− buildNumber = "28";
25− packageType = "jre";
26− vmType = "hotspot";
27− sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c";
28− };
29− jdk-openj9 = makePackage {
30− version = "11.0.1";
31− buildNumber = "13";
32− packageType = "jdk";
33− vmType = "openj9";
34− sha256 = "765947ab9457a29d2aa9d11460a4849611343c1e0ea3b33b9c08409cd4672251";
35− };
36− jre-openj9 = makePackage {
37− version = "11.0.1";
38− buildNumber = "13";
39− packageType = "jre";
40− vmType = "openj9";
41− sha256 = "a016413fd8415429b42e543fed7a1bee5010b1dbaf71d29a26e1c699f334c6ff";
42− };
5+ jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.hotspot;
6+ jre-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.hotspot;
7+ jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.openj9;
8+ jre-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.openj9;
439}
pkgs/development/compilers/adoptopenjdk-bin/sources.jsonnew file+94
@@ -0,0 +1,94 @@
1+{
2+ "openjdk11": {
3+ "linux": {
4+ "jdk": {
5+ "hotspot": {
6+ "aarch64": {
7+ "sha256": "b66121b9a0c2e7176373e670a499b9d55344bcb326f67140ad6d0dc24d13d3e2",
8+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz"
9+ },
10+ "build": "13",
11+ "packageType": "jdk",
12+ "version": "11.0.1",
13+ "vmType": "hotspot",
14+ "x86_64": {
15+ "sha256": "22bd2f1a2e0cb6e4075967bfeda4a960b0325879305aa739a0ba2d6e5cd4c3e2",
16+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz"
17+ }
18+ },
19+ "openj9": {
20+ "build": "13",
21+ "packageType": "jdk",
22+ "version": "11.0.1",
23+ "vmType": "openj9",
24+ "x86_64": {
25+ "sha256": "ef9bf07cba79082285a9d426ea4eb3e8df57561ce2afe07cc5f299a8fa203279",
26+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz"
27+ }
28+ }
29+ },
30+ "jre": {
31+ "hotspot": {
32+ "aarch64": {
33+ "sha256": "6fd756bda392e3fddb48382460daae263c6fb5708683a691c8d30af2eb870bb8",
34+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz"
35+ },
36+ "build": "28",
37+ "packageType": "jre",
38+ "version": "11",
39+ "vmType": "hotspot",
40+ "x86_64": {
41+ "sha256": "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c",
42+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_hotspot_11_28.tar.gz"
43+ }
44+ },
45+ "openj9": {
46+ "build": "28",
47+ "packageType": "jre",
48+ "version": "11",
49+ "vmType": "openj9",
50+ "x86_64": {
51+ "sha256": "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42",
52+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz"
53+ }
54+ }
55+ }
56+ },
57+ "mac": {
58+ "jdk": {
59+ "hotspot": {
60+ "build": "13",
61+ "packageType": "jdk",
62+ "version": "11.0.1",
63+ "vmType": "hotspot",
64+ "x86_64": {
65+ "sha256": "e219e7e2d586ed09ae65f4ec390fca5d5f0c37a61b47677648610194daf1aaa7",
66+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz"
67+ }
68+ },
69+ "openj9": {
70+ "build": "13",
71+ "packageType": "jdk",
72+ "version": "11.0.1",
73+ "vmType": "openj9",
74+ "x86_64": {
75+ "sha256": "c9a816d6a3f8aac9dc5b3b41c5a9e4e5460af433a06e003ae25d5a06dea8375f",
76+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_macosXL-jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz"
77+ }
78+ }
79+ },
80+ "jre": {
81+ "hotspot": {
82+ "build": "28",
83+ "packageType": "jre",
84+ "version": "11",
85+ "vmType": "hotspot",
86+ "x86_64": {
87+ "sha256": "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c",
88+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz"
89+ }
90+ }
91+ }
92+ }
93+ }
94+}