mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 14:22:50 +03:00
Merge pull request #10510 from taku0/oraclejdk-8u65
oraclejdk: 8u60 -> 8u65, 8u66
This commit is contained in:
commit
916c10138a
@ -1,9 +1,9 @@
|
||||
import ./jdk-linux-base.nix {
|
||||
productVersion = "8";
|
||||
patchVersion = "60";
|
||||
patchVersion = "65";
|
||||
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
|
||||
sha256_i686 = "e6a36b458351ed35bd7943739ba93d9a246e08a86433e148ff68b1b40d74c2e5";
|
||||
sha256_x86_64 = "ebe51554d2f6c617a4ae8fc9a8742276e65af01bd273e96848b262b3c05424e5";
|
||||
sha256_i686 = "1shri8mw648piivyparbpzskiq4i0z6kain9kr7ylav5mv7h66fg";
|
||||
sha256_x86_64 = "1rr6g2sb0f1vyf3l9nvj49ah28bsid92z0lj9pfjlb12vjn2mnw8";
|
||||
jceName = "jce_policy-8.zip";
|
||||
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
|
||||
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
|
||||
|
10
pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
Normal file
10
pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
Normal file
@ -0,0 +1,10 @@
|
||||
import ./jdk-linux-base.nix {
|
||||
productVersion = "8";
|
||||
patchVersion = "66";
|
||||
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
|
||||
sha256_i686 = "18l4r89na4z92djcdgyinjlhl6fmgz4x1sm40lwrsiwzg26nl0i1";
|
||||
sha256_x86_64 = "02nwcgplq14vj1vkz99r5x20lg86hscrxb5aaifwcny7l5gsv5by";
|
||||
jceName = "jce_policy-8.zip";
|
||||
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
|
||||
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
|
||||
}
|
@ -4119,6 +4119,8 @@ let
|
||||
|
||||
oraclejdk8 = pkgs.oraclejdk8distro true false;
|
||||
|
||||
oraclejdk8psu = pkgs.oraclejdk8psu_distro true false;
|
||||
|
||||
oraclejre = lowPrio (pkgs.jdkdistro false false);
|
||||
|
||||
oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false);
|
||||
@ -4127,6 +4129,8 @@ let
|
||||
|
||||
oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false);
|
||||
|
||||
oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false);
|
||||
|
||||
jrePlugin = lowPrio (pkgs.jdkdistro false true);
|
||||
|
||||
supportsJDK =
|
||||
@ -4153,6 +4157,11 @@ let
|
||||
(if pluginSupport then appendToName "with-plugin" else x: x)
|
||||
(callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { inherit installjdk; });
|
||||
|
||||
oraclejdk8psu_distro = installjdk: pluginSupport:
|
||||
assert supportsJDK;
|
||||
(if pluginSupport then appendToName "with-plugin" else x: x)
|
||||
(callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk; });
|
||||
|
||||
jikes = callPackage ../development/compilers/jikes { };
|
||||
|
||||
julia = callPackage ../development/compilers/julia {
|
||||
|
Loading…
Reference in New Issue
Block a user