about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2020-01-15 18:57:27 +0000
committervolth <volth@volth.com>2020-01-15 19:09:35 +0000
commit619d52a37ef190017a71b26469ec434f1861c20e (patch)
tree879675d246a7900e933edfd71a7a20729685031a /pkgs/top-level
parentc1151c1f88d104e4de9c747461d344b0a566c1ee (diff)
downloadnixlib-619d52a37ef190017a71b26469ec434f1861c20e.tar
nixlib-619d52a37ef190017a71b26469ec434f1861c20e.tar.gz
nixlib-619d52a37ef190017a71b26469ec434f1861c20e.tar.bz2
nixlib-619d52a37ef190017a71b26469ec434f1861c20e.tar.lz
nixlib-619d52a37ef190017a71b26469ec434f1861c20e.tar.xz
nixlib-619d52a37ef190017a71b26469ec434f1861c20e.tar.zst
nixlib-619d52a37ef190017a71b26469ec434f1861c20e.zip
oraclejdk8: 8u211 -> 8u241
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix12
1 files changed, 1 insertions, 11 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 245abf731dda..587a1ec3d7fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8398,14 +8398,10 @@ in
 
   oraclejdk8 = pkgs.oraclejdk8distro true false;
 
-  oraclejdk8psu = pkgs.oraclejdk8psu_distro true false;
-
   oraclejre = lowPrio (pkgs.jdkdistro false false);
 
   oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false);
 
-  oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false);
-
   jrePlugin = jre8Plugin;
 
   jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true);
@@ -8414,13 +8410,7 @@ in
 
   oraclejdk8distro = installjdk: pluginSupport:
     (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix {
-        inherit installjdk pluginSupport;
-      });
-
-  oraclejdk8psu_distro = installjdk: pluginSupport:
-    (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix {
+      (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix {
         inherit installjdk pluginSupport;
       });