From 3cfa035a9957cc0d4169ced909841d7ac3383613 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 3 Nov 2018 21:34:33 +0900 Subject: [PATCH] adoptopenjdk-openj9-bin: 11 -> 11.0.1 --- .../adoptopenjdk-bin/jdk11-darwin.nix | 27 +++++++++++++++---- .../adoptopenjdk-bin/jdk11-linux.nix | 21 ++++++++++----- pkgs/top-level/all-packages.nix | 9 ++++--- 3 files changed, 42 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix index 77d9d85aaa9..573f5e175ec 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix @@ -1,26 +1,43 @@ let - version = "11"; - buildNumber = "28"; - baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}"; - makePackage = { packageType, vmType, sha256 }: import ./jdk-darwin-base.nix { + makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-darwin-base.nix { name = if packageType == "jdk" then "adoptopenjdk-${vmType}-bin-${version}" else "adoptopenjdk-${packageType}-${vmType}-bin-${version}"; - url = "${baseUrl}/OpenJDK${version}-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz"; + + url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz"; + inherit sha256; }; in { jdk-hotspot = makePackage { + version = "11"; + buildNumber = "28"; packageType = "jdk"; vmType = "hotspot"; sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3"; }; jre-hotspot = makePackage { + version = "11"; + buildNumber = "28"; packageType = "jre"; vmType = "hotspot"; sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c"; }; + jdk-openj9 = makePackage { + version = "11.0.1"; + buildNumber = "13"; + packageType = "jdk"; + vmType = "openj9"; + sha256 = "c5e9b588b4ac5b0bd5b4edd69d59265d1199bb98af7ca3270e119b264ffb6e3f"; + }; + jre-openj9 = makePackage { + version = "11.0.1"; + buildNumber = "13"; + packageType = "jre"; + vmType = "openj9"; + sha256 = "0901dc5946fdf967f92f7b719ddfffdcdde5bd3fef86a83d7a3f2f39ddbef1f8"; + }; } diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix index 6e00782c391..f4990b6effc 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix @@ -1,36 +1,43 @@ let - version = "11"; - buildNumber = "28"; - baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}"; - makePackage = { packageType, vmType, sha256 }: import ./jdk-linux-base.nix { + makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-linux-base.nix { name = if packageType == "jdk" then "adoptopenjdk-${vmType}-bin-${version}" else "adoptopenjdk-${packageType}-${vmType}-bin-${version}"; - url = "${baseUrl}/OpenJDK${version}-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz"; + + url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz"; + inherit sha256; }; in { jdk-hotspot = makePackage { + version = "11"; + buildNumber = "28"; packageType = "jdk"; vmType = "hotspot"; sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af"; }; jre-hotspot = makePackage { + version = "11"; + buildNumber = "28"; packageType = "jre"; vmType = "hotspot"; sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c"; }; jdk-openj9 = makePackage { + version = "11.0.1"; + buildNumber = "13"; packageType = "jdk"; vmType = "openj9"; - sha256 = "fd77f22eb74078bcf974415abd888296284d2ceb81dbaca6ff32f59416ebc57f"; + sha256 = "765947ab9457a29d2aa9d11460a4849611343c1e0ea3b33b9c08409cd4672251"; }; jre-openj9 = makePackage { + version = "11.0.1"; + buildNumber = "13"; packageType = "jre"; vmType = "openj9"; - sha256 = "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42"; + sha256 = "a016413fd8415429b42e543fed7a1bee5010b1dbaf71d29a26e1c699f334c6ff"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f214f7043b8..973e46071cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6458,9 +6458,12 @@ with pkgs; then callPackage adoptopenjdk-bin-11-packages-linux.jre-hotspot {} else callPackage adoptopenjdk-bin-11-packages-darwin.jre-hotspot {}; - # no OpenJ9 for Darwin - adoptopenjdk-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {}; - adoptopenjdk-jre-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}; + adoptopenjdk-openj9-bin-11 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-openj9 {}; + adoptopenjdk-jre-openj9-bin-11 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {}; adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11;