MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move jdk -> oraclejdk

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

0
pkgs/development/compilers/jdk/dlj-bundle-builder.sh → pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
View file

0
pkgs/development/compilers/jdk/jdk-linux-base.nix → pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View file

0
pkgs/development/compilers/jdk/jdk6-construct.sh → pkgs/development/compilers/oraclejdk/jdk6-construct.sh
View file

0
pkgs/development/compilers/jdk/jdk6-linux.nix → pkgs/development/compilers/oraclejdk/jdk6-linux.nix
View file

0
pkgs/development/compilers/jdk/jdk7-linux.nix → pkgs/development/compilers/oraclejdk/jdk7-linux.nix
View file

0
pkgs/development/compilers/jdk/jdk8-linux.nix → pkgs/development/compilers/oraclejdk/jdk8-linux.nix
View file

6
pkgs/top-level/all-packages.nix
View file

@ -3067,17 +3067,17 @@ let
jdkdistro = installjdk: pluginSupport: jdkdistro = installjdk: pluginSupport:
assert supportsJDK; assert supportsJDK;
(if pluginSupport then appendToName "with-plugin" else x: x) (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: oraclejdk7distro = installjdk: pluginSupport:
assert supportsJDK; assert supportsJDK;
(if pluginSupport then appendToName "with-plugin" else x: x) (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: oraclejdk8distro = installjdk: pluginSupport:
assert supportsJDK; assert supportsJDK;
(if pluginSupport then appendToName "with-plugin" else x: x) (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 { }; jikes = callPackage ../development/compilers/jikes { };