From 72e76a18c122ec657fd6825764be79db8d73b3ce Mon Sep 17 00:00:00 2001
From: Daniel Peebles <pumpkin@me.com>
Date: Sat, 20 Sep 2014 11:29:59 -0400
Subject: [PATCH] Update maven to 3.2.3 and put it in a more sensible location

Closes #4187.

Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
---
 .../tools/build-managers/apache-maven}/builder.sh           | 0
 .../tools/build-managers/apache-maven}/default.nix          | 6 +++---
 pkgs/top-level/all-packages.nix                             | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/{misc/maven => development/tools/build-managers/apache-maven}/builder.sh (100%)
 rename pkgs/{misc/maven => development/tools/build-managers/apache-maven}/default.nix (66%)

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 b7cb84fbb3c..69dbf46bcdd 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 9553dc27ac6..9f643468ac3 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;
   };