ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-01 16:34:15 +03:00
Code Issues Projects Releases Wiki Activity

Remove openjdk namespace pollution

Browse Source 
Fixes #9743.
This commit is contained in:
Eelco Dolstra 2015-09-09 11:43:27 +02:00
parent af82c983fc
commit ee83598688
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4125,26 +4125,16 @@ let
path64 = callPackage ../development/compilers/path64 { }; path64 = callPackage ../development/compilers/path64 { };
openjdk7-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
openjdk8-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
openjdk7-make-bootstrap = callPackage ../development/compilers/openjdk/make-bootstrap.nix {
openjdk = openjdk7.override { minimal = true; };
};
openjdk8-make-bootstrap = callPackage ../development/compilers/openjdk/make-bootstrap.nix {
openjdk = openjdk8.override { minimal = true; };
};
openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { }; openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { };
openjdk7 = callPackage ../development/compilers/openjdk { openjdk7 = callPackage ../development/compilers/openjdk {
bootjdk = openjdk7-bootstrap; 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/openjdk8.nix {
bootjdk = openjdk8-bootstrap; bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
}; };
openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; }; openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; };
openjdk8_jre = openjdk8.jre // { outputs = [ "jre" ]; }; openjdk8_jre = openjdk8.jre // { outputs = [ "jre" ]; };