diff --git a/pkgs/misc/maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh similarity index 100% rename from pkgs/misc/maven/builder.sh rename to pkgs/development/tools/build-managers/apache-maven/builder.sh diff --git a/pkgs/misc/maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix similarity index 66% rename from pkgs/misc/maven/default.nix rename to pkgs/development/tools/build-managers/apache-maven/default.nix index b7cb84fbb3c4..69dbf46bcddc 100644 --- a/pkgs/misc/maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -3,13 +3,13 @@ assert jdk != null; stdenv.mkDerivation { - name = "apache-maven-3.1.1"; + name = "apache-maven-3.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://apache/maven/binaries/apache-maven-3.1.1-bin.tar.gz; - sha256 = "06ymc5y8bp5crcz74z2m9pf58aid5q11v2klnjmxb4ar8mkd8zh7"; + url = mirror://apache/maven/maven-3/3.2.3/binaries/apache-maven-3.2.3-bin.tar.gz; + sha256 = "1vd81bhj68mhnkb0zlarshlk61i2n160pyxxmrc739p3vsm08gxz"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9553dc27ac68..9f643468ac3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4288,6 +4288,9 @@ let 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 { }; neoload = callPackage ../development/tools/neoload { @@ -11609,9 +11612,6 @@ let martyr = callPackage ../development/libraries/martyr { }; - maven = maven3; - maven3 = callPackage ../misc/maven { jdk = openjdk; }; - mess = callPackage ../misc/emulators/mess { inherit (pkgs.gnome) GConf; };