Move jdk -> oraclejdk

This commit is contained in:
Eelco Dolstra 2014-07-16 18:35:35 +02:00
parent c39bee0c0f
commit 94db68d283
7 changed files with 3 additions and 3 deletions

View file

@ -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 { };