From ee8359868831991f6cf3ca62d950d731c66796db Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 9 Sep 2015 11:43:27 +0200 Subject: [PATCH] Remove openjdk namespace pollution Fixes #9743. --- pkgs/top-level/all-packages.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b933629a2e..2d5acc357fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4125,26 +4125,16 @@ let 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 { }; openjdk7 = callPackage ../development/compilers/openjdk { - bootjdk = openjdk7-bootstrap; + bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; }; }; openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; }; openjdk7_jre = openjdk7.jre // { outputs = [ "jre" ]; }; 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_jre = openjdk8.jre // { outputs = [ "jre" ]; };