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

Merge pull request #19057 from grahamc/java7

Browse Source 
oraclejdk7: remove due to end of life
This commit is contained in:
Graham Christensen 2016-09-29 08:52:02 -04:00 committed by GitHub
commit fdada558c0
3 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/oraclejdk/jdk7-linux.nix
View File

@ -1,10 +0,0 @@
import ./jdk-linux-base.nix {
productVersion = "7";
patchVersion = "79";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
sha256_i686 = "1hv9bmj08y8gavhhkip5w5dg96b1dy4sc2cidpjcbwpb2mzh5lhs";
sha256_x86_64 = "140xl5kfdrlmh8wh2x3j23x53dbil8qxsvc7gf3138mz4805vmr9";
jceName = "UnlimitedJCEPolicyJDK7.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";
}

10
pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix
View File

@ -1,10 +0,0 @@
import ./jdk-linux-base.nix {
productVersion = "7";
patchVersion = "80";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
sha256_i686 = "1fjpm8pa74c4vgv93lnky6pd3igln56yxdn4kbhgcg12lwc17vcx";
sha256_x86_64 = "08wn62sammvsvlqac0n8grrikl0ykh9ikqdy823i2mcnccqsgnds";
jceName = "UnlimitedJCEPolicyJDK7.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";
}

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

@ -4869,28 +4869,18 @@ in
oraclejdk = pkgs.jdkdistro true false;
oraclejdk7 = pkgs.oraclejdk7distro true false;
oraclejdk7psu = pkgs.oraclejdk7psu_distro true false;
oraclejdk8 = pkgs.oraclejdk8distro true false;
oraclejdk8psu = pkgs.oraclejdk8psu_distro 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);
oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false);
jrePlugin = jre8Plugin;
jre7Plugin = lowPrio (pkgs.oraclejdk7distro false true);
jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true);
supportsJDK =
@ -4899,16 +4889,6 @@ in
jdkdistro = oraclejdk8distro;
oraclejdk7distro = installjdk: pluginSupport:
assert supportsJDK;
(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)