Merge pull request #45881 from andir/openjdk10

openjdk: 10.0.1 -> 10.0.2
This commit is contained in:
xeji 2018-09-01 00:29:27 +02:00 committed by GitHub
commit 254bb9dc41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -17,8 +17,8 @@ let
"i386" "i386"
else "amd64"; else "amd64";
update = "10.0.1"; update = "10.0.2";
build = "10"; build = "13";
repover = "jdk-${update}+${build}"; repover = "jdk-${update}+${build}";
paxflags = if stdenv.isi686 then "msp" else "m"; paxflags = if stdenv.isi686 then "msp" else "m";
@ -27,7 +27,7 @@ let
src = fetchurl { src = fetchurl {
url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz"; url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz";
sha256 = "1fg0rl5pd3f2y3v3bq8p3zdkrpa1pyslwdln4s64clyr7spvxkjw"; sha256 = "0y7hyzgvn6z8gyp3h9xvxwj6zda899y6i629jn6yxqzj96q56jpk";
}; };
outputs = [ "out" "jre" ]; outputs = [ "out" "jre" ];

View File

@ -7,11 +7,11 @@ let
}; };
jdk = stdenv.mkDerivation { jdk = stdenv.mkDerivation {
name = "zulu10.1+11-jdk10"; name = "zulu10.3+5-jdk10";
src = fetchurl { src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/zulu10.1+11-jdk10-macosx_x64.zip"; url = https://cdn.azul.com/zulu/bin/zulu10.3+5-jdk10.0.2-macosx_x64.zip;
sha256 = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y"; sha256 = "05pxfjn8fqw6ddr8m5hzyphwzqgrq8w6b4h3lwc1s7ymh05xmspz";
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
}; };