From 38c5876b2d125d18086b570f337910df9738db30 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 28 Sep 2016 16:39:12 -0400 Subject: [PATCH] oraclejdk7: remove due to end of life --- .../compilers/oraclejdk/jdk7-linux.nix | 10 ---------- .../compilers/oraclejdk/jdk7psu-linux.nix | 10 ---------- pkgs/top-level/all-packages.nix | 20 ------------------- 3 files changed, 40 deletions(-) delete mode 100644 pkgs/development/compilers/oraclejdk/jdk7-linux.nix delete mode 100644 pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix diff --git a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix deleted file mode 100644 index 730b3b569c6..00000000000 --- a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix +++ /dev/null @@ -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"; -} diff --git a/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix deleted file mode 100644 index 311f07e8e45..00000000000 --- a/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix +++ /dev/null @@ -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"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58eda14f3b8..051b0e0f3be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4865,28 +4865,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 = @@ -4895,16 +4885,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)