diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e2861a3822..7bc27896fe6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4129,7 +4129,7 @@ let hdf5 = null; glpk = null; suitesparse = null; - openjdk = null; + jdk = null; gnuplot = null; }; octaveFull = (lowPrio (callPackage ../development/interpreters/octave { @@ -4690,7 +4690,7 @@ let lttv = callPackage ../development/tools/misc/lttv { }; maven = maven3; - maven3 = callPackage ../development/tools/build-managers/apache-maven { jdk = openjdk; }; + maven3 = callPackage ../development/tools/build-managers/apache-maven { }; mk = callPackage ../development/tools/build-managers/mk { }; @@ -10244,7 +10244,6 @@ let inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; - jdk = openjdk; boost = boost155; glm = glm_0954; fontsConf = makeFontsConf {