Skip to content

oraclejdk: bump to 8u25, 7u71, and 7u72 #4541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
taku0 wants to merge 1 commit into from
Closed

oraclejdk: bump to 8u25, 7u71, and 7u72 #4541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/development/compilers/oraclejdk/jdk7-linux.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import ./jdk-linux-base.nix {
productVersion = "7";
patchVersion = "67";
patchVersion = "71";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
sha256_i686 = "0p58pag1x85r911lxhmr4blk687ivjqigflx175vp7rcmmj108xn";
sha256_x86_64 = "0db36jg08qy8712qy6lgyifdqlqb468rrnjm3aa6937ixl9ixpal";
sha256_i686 = "d3c09a35abc0464d8ad70dfe17e02597eb4c5d489ff4d1bcd14088aeb5016424";
sha256_x86_64 = "80d5705fc37fc4eabe3cea480e0530ae0436c2c086eb8fc6f65bb21e8594baf8";
jceName = "UnlimitedJCEPolicyJDK7.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";
Expand Down
10 changes: 10 additions & 0 deletions pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import ./jdk-linux-base.nix {
productVersion = "7";
patchVersion = "72";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
sha256_i686 = "0376c8a0280752b4389b6cb193d463826c55c821587d0278b7fea665a140f407";
sha256_x86_64 = "dd1d438e1b7d4b9bb5ea4659f2103b577d1568da51b53f97b736b3232eeade8e";
jceName = "UnlimitedJCEPolicyJDK7.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";
}
6 changes: 3 additions & 3 deletions pkgs/development/compilers/oraclejdk/jdk8-linux.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import ./jdk-linux-base.nix {
productVersion = "8";
patchVersion = "20";
patchVersion = "25";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
sha256_i686 = "fa013b3fcbb1308040bf0e75bbd6ef7e8396b547cbc8dd79e3cb8153604bfd06";
sha256_x86_64 = "3e717622ae48af5ca7298e7797cb71d4d545238f362741a83e69c097ca055de4";
sha256_i686 = "17f396a541db09c732032185f10f9c6eb42ac7b5776814602342de9655b2e0e2";
sha256_x86_64 = "057f660799be2307d2eefa694da9d3fce8e165807948f5bcaa04f72845d2f529";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59";
Expand Down
9 changes: 9 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3269,12 +3269,16 @@ let

oraclejdk7 = pkgs.oraclejdk7distro true false;

oraclejdk7psu = pkgs.oraclejdk7psu_distro true false;

oraclejdk8 = pkgs.oraclejdk8distro true false;

oraclejre = lowPrio (pkgs.jdkdistro false false);

oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false);

oraclejre7psu = lowPrio (pkgs.oraclejdk7psu_distro false false);

oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false);

jrePlugin = lowPrio (pkgs.jdkdistro false true);
Expand All @@ -3293,6 +3297,11 @@ let
(if pluginSupport then appendToName "with-plugin" else x: x)
(callPackage ../development/compilers/oraclejdk/jdk7-linux.nix { inherit installjdk; });

oraclejdk7psu_distro = installjdk: pluginSupport:
assert supportsJDK;
(if pluginSupport then appendToName "with-plugin" else x: x)
(callPackage ../development/compilers/oraclejdk/jdk7psu-linux.nix { inherit installjdk; });

oraclejdk8distro = installjdk: pluginSupport:
assert supportsJDK;
(if pluginSupport then appendToName "with-plugin" else x: x)
Expand Down