public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename OpenJDK expressions

Browse Source 
It's silly to have OpenJDK 7 in default.nix when it's not in fact the
default.
This commit is contained in:
Eelco Dolstra 2015-09-14 17:16:16 +02:00
parent f16eea1867
commit 7a1aa50908
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/compilers/openjdk/default.nix → pkgs/development/compilers/openjdk/7.nix
View File

0
pkgs/development/compilers/openjdk/openjdk8.nix → pkgs/development/compilers/openjdk/8.nix
View File

4
pkgs/top-level/all-packages.nix
View File

@ -4137,13 +4137,13 @@ let
openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { }; openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { };
openjdk7 = callPackage ../development/compilers/openjdk { openjdk7 = callPackage ../development/compilers/openjdk/7.nix {
bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; }; bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
}; };
openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; }; openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; };
openjdk7_jre = openjdk7.jre // { outputs = [ "jre" ]; }; openjdk7_jre = openjdk7.jre // { outputs = [ "jre" ]; };
openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix { openjdk8 = callPackage ../development/compilers/openjdk/8.nix {
bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
}; };
openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; }; openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; };