public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #49689 from taku0/adoptopenjdk-bin-11.0.1-openj9

Browse Source 
adoptopenjdk-openj9-bin: 11 -> 11.0.1 [Critical security fixes]
This commit is contained in:
Renaud 2018-11-09 10:31:27 +01:00 committed by GitHub
commit a232d0b210
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
View File

@ -1,26 +1,43 @@
let let
version = "11"; makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-darwin-base.nix {
buildNumber = "28";
baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}";
makePackage = { packageType, vmType, sha256 }: import ./jdk-darwin-base.nix {
name = if packageType == "jdk" name = if packageType == "jdk"
then then
"adoptopenjdk-${vmType}-bin-${version}" "adoptopenjdk-${vmType}-bin-${version}"
else else
"adoptopenjdk-${packageType}-${vmType}-bin-${version}"; "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; inherit sha256;
}; };
in in
{ {
jdk-hotspot = makePackage { jdk-hotspot = makePackage {
version = "11";
buildNumber = "28";
packageType = "jdk"; packageType = "jdk";
vmType = "hotspot"; vmType = "hotspot";
sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3"; sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3";
}; };
jre-hotspot = makePackage { jre-hotspot = makePackage {
version = "11";
buildNumber = "28";
packageType = "jre"; packageType = "jre";
vmType = "hotspot"; vmType = "hotspot";
sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c"; 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";
};
} }

21
pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
View File

@ -1,36 +1,43 @@
let let
version = "11"; makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-linux-base.nix {
buildNumber = "28";
baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}";
makePackage = { packageType, vmType, sha256 }: import ./jdk-linux-base.nix {
name = if packageType == "jdk" name = if packageType == "jdk"
then then
"adoptopenjdk-${vmType}-bin-${version}" "adoptopenjdk-${vmType}-bin-${version}"
else else
"adoptopenjdk-${packageType}-${vmType}-bin-${version}"; "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; inherit sha256;
}; };
in in
{ {
jdk-hotspot = makePackage { jdk-hotspot = makePackage {
version = "11";
buildNumber = "28";
packageType = "jdk"; packageType = "jdk";
vmType = "hotspot"; vmType = "hotspot";
sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af"; sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af";
}; };
jre-hotspot = makePackage { jre-hotspot = makePackage {
version = "11";
buildNumber = "28";
packageType = "jre"; packageType = "jre";
vmType = "hotspot"; vmType = "hotspot";
sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c"; sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c";
}; };
jdk-openj9 = makePackage { jdk-openj9 = makePackage {
version = "11.0.1";
buildNumber = "13";
packageType = "jdk"; packageType = "jdk";
vmType = "openj9"; vmType = "openj9";
sha256 = "fd77f22eb74078bcf974415abd888296284d2ceb81dbaca6ff32f59416ebc57f"; sha256 = "765947ab9457a29d2aa9d11460a4849611343c1e0ea3b33b9c08409cd4672251";
}; };
jre-openj9 = makePackage { jre-openj9 = makePackage {
version = "11.0.1";
buildNumber = "13";
packageType = "jre"; packageType = "jre";
vmType = "openj9"; vmType = "openj9";
sha256 = "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42"; sha256 = "a016413fd8415429b42e543fed7a1bee5010b1dbaf71d29a26e1c699f334c6ff";
}; };
} }

9
pkgs/top-level/all-packages.nix
View File

@ -6495,9 +6495,12 @@ with pkgs;
then callPackage adoptopenjdk-bin-11-packages-linux.jre-hotspot {} then callPackage adoptopenjdk-bin-11-packages-linux.jre-hotspot {}
else callPackage adoptopenjdk-bin-11-packages-darwin.jre-hotspot {}; else callPackage adoptopenjdk-bin-11-packages-darwin.jre-hotspot {};
# no OpenJ9 for Darwin adoptopenjdk-openj9-bin-11 = if stdenv.isLinux
adoptopenjdk-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {}; then callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {}
adoptopenjdk-jre-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jre-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-bin = adoptopenjdk-hotspot-bin-11;
adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11;