java: Correct more missed normalizations

Changed files
+2 -3
pkgs
top-level
+2 -3
pkgs/top-level/all-packages.nix
···
hdf5 = null;
glpk = null;
suitesparse = null;
-
openjdk = null;
gnuplot = null;
};
octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
···
lttv = callPackage ../development/tools/misc/lttv { };
maven = maven3;
-
maven3 = callPackage ../development/tools/build-managers/apache-maven { jdk = openjdk; };
mk = callPackage ../development/tools/build-managers/mk { };
···
inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome) GConf ORBit2 gnome_vfs;
zip = zip.override { enableNLS = false; };
-
jdk = openjdk;
boost = boost155;
glm = glm_0954;
fontsConf = makeFontsConf {
···
hdf5 = null;
glpk = null;
suitesparse = null;
+
jdk = null;
gnuplot = null;
};
octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
···
lttv = callPackage ../development/tools/misc/lttv { };
maven = maven3;
+
maven3 = callPackage ../development/tools/build-managers/apache-maven { };
mk = callPackage ../development/tools/build-managers/mk { };
···
inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome) GConf ORBit2 gnome_vfs;
zip = zip.override { enableNLS = false; };
boost = boost155;
glm = glm_0954;
fontsConf = makeFontsConf {