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

oraclejdk8: 8u211 -> 8u241

Browse Source
This commit is contained in:
volth
2020-01-15 19:09:35 +00:00
parent c1151c1f88
commit 619d52a37e
5 changed files with 31 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+20 -24
View File
@@ -1,15 +1,13 @@
{ productVersion
, patchVersion
, buildVersion
, sha256
, jceName
, releaseToken
, sha256JCE
}:
{ swingSupport ? true
, stdenv
, fetchurl
, requireFile
, makeWrapper
, unzip
, file
@@ -55,14 +53,14 @@ let
x86_64-linux = "amd64";
armv7l-linux = "arm";
aarch64-linux = "aarch64";
}.${stdenv.hostPlatform.system};
}.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
jce =
if installjce then
fetchurl {
url = "http://download.oracle.com/otn-pub/java/jce/${productVersion}/${jceName}";
requireFile {
name = jceName;
url = "http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html";
sha256 = sha256JCE;
curlOpts = "-b oraclelicense=a";
}
else
"";
@@ -76,25 +74,23 @@ let
in
assert sha256 ? ${stdenv.hostPlatform.system};
let result = stdenv.mkDerivation rec {
name =
if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}";
pname = if installjdk then "oraclejdk" else "oraclejre";
version = "${productVersion}u${patchVersion}";
src = let
platformName = {
i686-linux = "linux-i586";
x86_64-linux = "linux-x64";
armv7l-linux = "linux-arm32-vfp-hflt";
aarch64-linux = "linux-arm64-vfp-hflt";
}.${stdenv.hostPlatform.system};
javadlPlatformName = "linux-i586";
in fetchurl {
url = "http://javadl.oracle.com/webapps/download/GetFile/1.${productVersion}.0_${patchVersion}-b${buildVersion}/${releaseToken}/${javadlPlatformName}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";
curlOpts = "-b oraclelicense=a";
sha256 = sha256.${stdenv.hostPlatform.system};
};
src =
let
platformName = {
i686-linux = "linux-i586";
x86_64-linux = "linux-x64";
armv7l-linux = "linux-arm32-vfp-hflt";
aarch64-linux = "linux-arm64-vfp-hflt";
}.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
in requireFile {
name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";
url = "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html";
sha256 = sha256.${stdenv.hostPlatform.system};
};
nativeBuildInputs = [ file ]
++ stdenv.lib.optional installjce unzip;