diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-16 18:35:35 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-16 18:35:35 +0200 |
commit | 94db68d2834b13bc6ea68fe568f9217ae5985fcb (patch) | |
tree | 5995749711aa7d44b27c1a892638d524e1c801fb /pkgs/top-level | |
parent | c39bee0c0f9b3b01786bc553532eb90cbaba2692 (diff) | |
download | nixlib-94db68d2834b13bc6ea68fe568f9217ae5985fcb.tar nixlib-94db68d2834b13bc6ea68fe568f9217ae5985fcb.tar.gz nixlib-94db68d2834b13bc6ea68fe568f9217ae5985fcb.tar.bz2 nixlib-94db68d2834b13bc6ea68fe568f9217ae5985fcb.tar.lz nixlib-94db68d2834b13bc6ea68fe568f9217ae5985fcb.tar.xz nixlib-94db68d2834b13bc6ea68fe568f9217ae5985fcb.tar.zst nixlib-94db68d2834b13bc6ea68fe568f9217ae5985fcb.zip |
Move jdk -> oraclejdk
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d128e171bef8..7a70b2e28507 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3067,17 +3067,17 @@ let jdkdistro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/jdk/jdk6-linux.nix { }); + (callPackage ../development/compilers/oraclejdk/jdk6-linux.nix { }); oraclejdk7distro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/jdk/jdk7-linux.nix { inherit installjdk; }); + (callPackage ../development/compilers/oraclejdk/jdk7-linux.nix { inherit installjdk; }); oraclejdk8distro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/jdk/jdk8-linux.nix { inherit installjdk; }); + (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { inherit installjdk; }); jikes = callPackage ../development/compilers/jikes { }; |