dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #54044 from Mic92/oraclejdk

Browse Source 
oraclejdk: 8.191 -> 8.201; no longer depend on requireFile
This commit is contained in:
Jörg Thalheim 2019-01-17 07:26:28 +00:00 committed by GitHub
commit d3d25f5218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 52 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@ -1,15 +1,15 @@
{ productVersion { productVersion
, patchVersion , patchVersion
, downloadUrl , buildVersion
, sha256 , sha256
, jceName , jceName
, jceDownloadUrl , releaseToken
, sha256JCE , sha256JCE
}: }:
{ swingSupport ? true { swingSupport ? true
, stdenv , stdenv
, requireFile , fetchurl
, makeWrapper , makeWrapper
, unzip , unzip
, file , file
@ -17,6 +17,7 @@
, installjdk ? true , installjdk ? true
, pluginSupport ? true , pluginSupport ? true
, installjce ? false , installjce ? false
, licenseAccepted ? false
, glib , glib
, libxml2 , libxml2
, libav_0_8 , libav_0_8
@ -36,6 +37,13 @@
assert swingSupport -> xorg != null; assert swingSupport -> xorg != null;
if !licenseAccepted then throw ''
You must accept the Oracle Binary Code License Agreement for Java SE at
https://www.oracle.com/technetwork/java/javase/terms/license/index.html
by setting nixpkgs config option 'oraclejdk.accept_license = true;'
''
else assert licenseAccepted;
let let
/** /**
@ -50,10 +58,10 @@ let
jce = jce =
if installjce then if installjce then
requireFile { fetchurl {
name = jceName; url = "http://download.oracle.com/otn-pub/java/jce/${productVersion}/${jceName}";
url = jceDownloadUrl;
sha256 = sha256JCE; sha256 = sha256JCE;
curlOpts = "-b oraclelicense=a";
} }
else else
""; "";
@ -67,18 +75,22 @@ let
in in
assert sha256 ? ${stdenv.hostPlatform.system};
let result = stdenv.mkDerivation rec { let result = stdenv.mkDerivation rec {
name = name =
if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}"; if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}";
src = requireFile { src = let
name = { platformName = {
i686-linux = "jdk-${productVersion}u${patchVersion}-linux-i586.tar.gz"; i686-linux = "linux-i586";
x86_64-linux = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz"; x86_64-linux = "linux-x64";
armv7l-linux = "jdk-${productVersion}u${patchVersion}-linux-arm32-vfp-hflt.tar.gz"; armv7l-linux = "linux-arm32-vfp-hflt";
aarch64-linux = "jdk-${productVersion}u${patchVersion}-linux-arm64-vfp-hflt.tar.gz"; aarch64-linux = "linux-arm64-vfp-hflt";
}.${stdenv.hostPlatform.system}; }.${stdenv.hostPlatform.system};
url = downloadUrl; in fetchurl {
url = "http://download.oracle.com/otn-pub/java/jdk/${productVersion}u${patchVersion}-b${buildVersion}/${releaseToken}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";
curlOpts = "-b oraclelicense=a";
sha256 = sha256.${stdenv.hostPlatform.system}; sha256 = sha256.${stdenv.hostPlatform.system};
}; };

16
pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
View File

@ -1,12 +1,14 @@
# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
# jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
import ./jdk-linux-base.nix { import ./jdk-linux-base.nix {
productVersion = "8"; productVersion = "8";
patchVersion = "191"; patchVersion = "201";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; buildVersion = "09";
sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4"; sha256.i686-linux = "1f9n93zmkggchaxkchp4bqasvxznn96zjci34f52h7v392jkzqac";
sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk"; sha256.x86_64-linux = "0w730v2q0iaxf2lprabwmy7129byrs0hhdbwas575p1xmk00qw6b";
sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v"; sha256.armv7l-linux = "0p82d2vah63a6r2rip9v17lbjam39kgqp0584q3cnljgr5p9gyhz";
sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz"; sha256.aarch64-linux = "1qm4b3aj5wi0hp9q6gy1da4bz5k9ky4shgiqa4zxrib4kjp9yf0k";
releaseToken = "42970487e3af4f5aa5bca3f542482c60";
jceName = "jce_policy-8.zip"; jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
} }

16
pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
View File

@ -1,12 +1,14 @@
# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
# jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
import ./jdk-linux-base.nix { import ./jdk-linux-base.nix {
productVersion = "8"; productVersion = "8";
patchVersion = "191"; patchVersion = "201";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; buildVersion = "09";
sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4"; sha256.i686-linux = "1f9n93zmkggchaxkchp4bqasvxznn96zjci34f52h7v392jkzqac";
sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk"; sha256.x86_64-linux = "0w730v2q0iaxf2lprabwmy7129byrs0hhdbwas575p1xmk00qw6b";
sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v"; sha256.armv7l-linux = "0p82d2vah63a6r2rip9v17lbjam39kgqp0584q3cnljgr5p9gyhz";
sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz"; sha256.aarch64-linux = "1qm4b3aj5wi0hp9q6gy1da4bz5k9ky4shgiqa4zxrib4kjp9yf0k";
releaseToken = "42970487e3af4f5aa5bca3f542482c60";
jceName = "jce_policy-8.zip"; jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
} }

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

@ -7224,11 +7224,17 @@ in
oraclejdk8distro = installjdk: pluginSupport: oraclejdk8distro = installjdk: pluginSupport:
(if pluginSupport then appendToName "with-plugin" else x: x) (if pluginSupport then appendToName "with-plugin" else x: x)
(callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { inherit installjdk pluginSupport; }); (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix {
inherit installjdk pluginSupport;
licenseAccepted = config.oraclejdk.accept_license or false;
});
oraclejdk8psu_distro = installjdk: pluginSupport: oraclejdk8psu_distro = installjdk: pluginSupport:
(if pluginSupport then appendToName "with-plugin" else x: x) (if pluginSupport then appendToName "with-plugin" else x: x)
(callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; }); (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix {
inherit installjdk pluginSupport;
licenseAccepted = config.oraclejdk.accept_license or false;
});
javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { };