Finishing the update from trunk, having resolved the eclipse related directory

renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661

pkgs/misc/drivers/gutenprint/default.nix

@@ -1,13 +1,16 @@
 # this package was called gimp-print in the past
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf wwf; in
+{ fetchurl, stdenv, lib, pkgconfig, composableDerivation, cups
+, libtiff, libpng, openssl, git, gimp }@args :
+
+let
+   version = "5.2.4";
+   inherit (args.composableDerivation) composableDerivation edf wwf;
+in
 composableDerivation {} {
-
-
-  name = "gutenprint-drivers";
+  name = "gutenprint-${version}";
 
   src = fetchurl {
-    url = mirror://sourceforge/gimp-print/files/gutenprint-5.2/5.2.4/gutenprint-5.2.4.tar.bz2;
+    url = "mirror://sourceforge/gimp-print/files/gutenprint-5.2/${version}/gutenprint-${version}.tar.bz2";
     sha256 = "09lnmf92h51sm0hmzd1hn2kl1sh6dxlnc0zjd9lrifzg0miyh45n";
   };
 

pkgs/misc/maven/builder.sh

@@ -1,17 +1,11 @@
 source $stdenv/setup
-source $makeWrapper
 
 unpackPhase
 
 mkdir -p $out
 cp -r $name/* $out
 
-# Make a backup of the original directory
-cp -r $out/bin $out/bin-orig
-# Remove the original mvn from the bin directory
-rm $out/bin/$mavenBinary
-# Set the JAVA_HOME variable when using Maven
-makeWrapper "$out/bin-orig/$mavenBinary" "$out/bin/$mavenBinary" --set JAVA_HOME "$jdk"
+wrapProgram $out/bin/mvn --set JAVA_HOME "$jdk"
 
 # Add the maven-axis and JIRA plugin by default when using maven 1.x
 if [ -e $out/bin/maven ]

pkgs/misc/maven/default.nix

@@ -1,16 +1,15 @@
-{stdenv, fetchurl, jdk}:
+{stdenv, fetchurl, jdk, makeWrapper}:
 
 assert jdk != null;
 
 stdenv.mkDerivation {
-	name = "maven-2.0.3";
-	mavenBinary = "mvn";
+	name = "apache-maven-2.2.1";
 	builder = ./builder.sh;
 	src = fetchurl {
-		url = http://apache.cs.uu.nl/dist/maven/binaries/maven-2.0.3-bin.tar.bz2;
-		md5 = "14b3a62c45f5c7b3a7f72f87ffadb8e0";
+		url = mirror://apache/maven/binaries/apache-maven-2.2.1-bin.tar.gz;
+		sha256 = "0xnk08ndf1jx458sr5dfr8rh7wi92kyn887vqyzjm1ka91cnb8xr";
 	};
-	makeWrapper = ../../build-support/make-wrapper/make-wrapper.sh;
 	
+        buildInputs = [makeWrapper]; 
 	inherit jdk;
 }

pkgs/misc/maven/maven-2.nix

@@ -1,23 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "maven-2.1.0-bin";
-
-  src = fetchurl {
-    # TODO mirrors 
-    url = http://apache.mirroring.de/maven/binaries/apache-maven-2.1.0-bin.zip;
-    sha256 = "13xda2l05pqs7x8ig85i9dqbdbv970zfgqif4wgjz8nn36jbxpvd";
-  };
-
-  buildInputs = [ unzip ];
-
-  phases = "unpackPhase installPhase";
-
-  installPhase = "
-    ensureDir \$out; mv * \$out
-  ";
-
-  meta = { 
-      description = "Java build tool";
-      homepage = "apache.org";
-    };
-}