git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #54496 from taku0/adoptopenjdk_11.0.2

adoptopenjdk: 11.0.1 -> 11.0.2 (x86_64-linux only) [Security fixes]

commit8dd8698d2edff572e9bb809bf4a15a1e24cc549a authorJörg Thalheim <Mic92@users.noreply.github.com> dateFri 25 Jan 2019, 14:38 (8 years ago) parentf6414423a99772
4 files changed+42−41
pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py+2−8 pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix+5−4 pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix+5−3 pkgs/development/compilers/adoptopenjdk-bin/sources.json+30−26
pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py+2−8
@@ -38,21 +38,15 @@ def generate_sources(release, assets):
3838 type_map = out.setdefault(asset["os"], {})
3939 impl_map = type_map.setdefault(asset["binary_type"], {})
4040 arch_map = impl_map.setdefault(asset["openjdk_impl"], {
41− "version": version,
42− "build": build,
4341 "packageType": asset["binary_type"],
4442 "vmType": asset["openjdk_impl"],
4543 })
4644
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−
5345 arch_map[arch_to_nixos[asset["architecture"]]] = {
5446 "url": asset["binary_link"],
5547 "sha256": get_sha256(asset["checksum_link"]),
48+ "version": version,
49+ "build": build,
5650 }
5751
5852 return out
pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix+5−4
@@ -5,13 +5,14 @@ sourcePerArch:
55, fetchurl
66}:
77
8−let result = stdenv.mkDerivation rec {
8+let cpuName = stdenv.hostPlatform.parsed.cpu.name;
9+ result = stdenv.mkDerivation rec {
910 name = if sourcePerArch.packageType == "jdk"
10− then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
11− else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
11+ then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"
12+ else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}";
1213
1314 src = fetchurl {
14− inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
15+ inherit (sourcePerArch.${cpuName}) url sha256;
1516 };
1617
1718 # See: https://github.com/NixOS/patchelf/issues/10
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix+5−3
@@ -42,15 +42,17 @@ let
4242 xorg.libXrender
4343 stdenv.cc.cc
4444 ]);
45+
46+ cpuName = stdenv.hostPlatform.parsed.cpu.name;
4547in
4648
4749let result = stdenv.mkDerivation rec {
4850 name = if sourcePerArch.packageType == "jdk"
49− then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
50− else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
51+ then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"
52+ else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}";
5153
5254 src = fetchurl {
53− inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
55+ inherit (sourcePerArch.${cpuName}) url sha256;
5456 };
5557
5658 nativeBuildInputs = [ file ];
pkgs/development/compilers/adoptopenjdk-bin/sources.json+30−26
@@ -4,52 +4,56 @@
44 "jdk": {
55 "hotspot": {
66 "aarch64": {
7+ "build": "13",
78 "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+ "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",
10+ "version": "11.0.1"
911 },
10− "build": "13",
1112 "packageType": "jdk",
12− "version": "11.0.1",
1313 "vmType": "hotspot",
1414 "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"
15+ "build": "7",
16+ "sha256": "d89304a971e5186e80b6a48a9415e49583b7a5a9315ba5552d373be7782fc528",
17+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz",
18+ "version": "11.0.2"
1719 }
1820 },
1921 "openj9": {
20− "build": "13",
2122 "packageType": "jdk",
22− "version": "11.0.1",
2323 "vmType": "openj9",
2424 "x86_64": {
25+ "build": "13",
2526 "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+ "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",
28+ "version": "11.0.1"
2729 }
2830 }
2931 },
3032 "jre": {
3133 "hotspot": {
3234 "aarch64": {
35+ "build": "28",
3336 "sha256": "6fd756bda392e3fddb48382460daae263c6fb5708683a691c8d30af2eb870bb8",
34− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz"
37+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz",
38+ "version": "11"
3539 },
36− "build": "28",
3740 "packageType": "jre",
38− "version": "11",
3941 "vmType": "hotspot",
4042 "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+ "build": "7",
44+ "sha256": "59c34373eec16b53798aedac73776b19e43f396fdff8a2879e66dc4b0cfd73cc",
45+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_7.tar.gz",
46+ "version": "11.0.2"
4347 }
4448 },
4549 "openj9": {
46− "build": "28",
4750 "packageType": "jre",
48− "version": "11",
4951 "vmType": "openj9",
5052 "x86_64": {
53+ "build": "28",
5154 "sha256": "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42",
52− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz"
55+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz",
56+ "version": "11"
5357 }
5458 }
5559 }
@@ -57,35 +61,35 @@
5761 "mac": {
5862 "jdk": {
5963 "hotspot": {
60− "build": "13",
6164 "packageType": "jdk",
62− "version": "11.0.1",
6365 "vmType": "hotspot",
6466 "x86_64": {
67+ "build": "13",
6568 "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"
69+ "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",
70+ "version": "11.0.1"
6771 }
6872 },
6973 "openj9": {
70− "build": "13",
7174 "packageType": "jdk",
72− "version": "11.0.1",
7375 "vmType": "openj9",
7476 "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+ "build": "13",
78+ "sha256": "b8960753a66190fa81982682357a2449b4183f3e23c20a5e3b4cf01e2989846b",
79+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz",
80+ "version": "11.0.1"
7781 }
7882 }
7983 },
8084 "jre": {
8185 "hotspot": {
82− "build": "28",
8386 "packageType": "jre",
84− "version": "11",
8587 "vmType": "hotspot",
8688 "x86_64": {
89+ "build": "28",
8790 "sha256": "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c",
88− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz"
91+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz",
92+ "version": "11"
8993 }
9094 }
9195 }