diff options
author | Austin Seipp <aseipp@pobox.com> | 2018-03-29 21:13:11 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2018-04-01 15:18:47 -0500 |
commit | f71b066d60918be31164707613e6f4ad62c8af0f (patch) | |
tree | 34cd6ef9af8ba3c1a359224665ecba2d3b6e13f4 /pkgs/top-level | |
parent | 0d04d010211e02b25a30b9a60d983ea1002b6943 (diff) | |
download | nixlib-f71b066d60918be31164707613e6f4ad62c8af0f.tar nixlib-f71b066d60918be31164707613e6f4ad62c8af0f.tar.gz nixlib-f71b066d60918be31164707613e6f4ad62c8af0f.tar.bz2 nixlib-f71b066d60918be31164707613e6f4ad62c8af0f.tar.lz nixlib-f71b066d60918be31164707613e6f4ad62c8af0f.tar.xz nixlib-f71b066d60918be31164707613e6f4ad62c8af0f.tar.zst nixlib-f71b066d60918be31164707613e6f4ad62c8af0f.zip |
nixpkgs: remove all Java 9 expressions
Java 9 is EOL, and we no longer need it with JDK 10 builds bootstrapped via JDK 10. Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea4b1496f3cd..31da6d85336f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6384,15 +6384,6 @@ with pkgs; inherit (gnome2) GConf gnome_vfs; }; - openjdk9 = - # if stdenv.isDarwin then - # callPackage ../development/compilers/openjdk-darwin/9.nix { } - # else - callPackage ../development/compilers/openjdk/9.nix { - bootjdk = openjdk8; - inherit (gnome2) GConf gnome_vfs; - }; - openjdk10 = callPackage ../development/compilers/openjdk/10.nix { bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; @@ -6420,20 +6411,6 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk9 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk9 else openjdk9 // { outputs = [ "out" ]; }; - jre9 = if stdenv.isArm || stdenv.isAarch64 then oraclejre9 else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (openjdk9.jre // { outputs = [ "jre" ]; })); - jre9_headless = - if stdenv.isArm || stdenv.isAarch64 then - oraclejre9 - else if stdenv.isDarwin then - jre9 - else - lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}-headless" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - ((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk10 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; }; jre10 = if stdenv.isArm || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } @@ -6462,8 +6439,6 @@ with pkgs; oraclejdk8psu = pkgs.oraclejdk8psu_distro true false; - oraclejdk9 = pkgs.oraclejdk9distro "JDK" false; - oraclejdk10 = pkgs.oraclejdk10distro "JDK" false; oraclejre = lowPrio (pkgs.jdkdistro false false); @@ -6472,12 +6447,8 @@ with pkgs; oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false); - oraclejre9 = lowPrio (pkgs.oraclejdk9distro "JRE" false); - oraclejre10 = lowPrio (pkgs.oraclejdk10distro "JRE" false); - oracleserverjre9 = lowPrio (pkgs.oraclejdk9distro "ServerJRE" false); - oracleserverjre10 = lowPrio (pkgs.oraclejdk10distro "ServerJRE" false); jrePlugin = jre8Plugin; @@ -6494,10 +6465,6 @@ with pkgs; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; }); - oraclejdk9distro = packageType: pluginSupport: - (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk9-linux.nix { inherit packageType pluginSupport; }); - oraclejdk10distro = packageType: pluginSupport: (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType pluginSupport; }); |