diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2009-11-25 07:51:06 +0000 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2009-11-25 07:51:06 +0000 |
| commit | 2ffa48af259c2fc438b16aad1f27557625d7430b (patch) | |
| tree | 3b6d9b65005f12f6ef54ea3cf7eec10c74101ae3 /pkgs/misc | |
| parent | f52952e504a2bfeefc3c2cde53d0d5f7901703a5 (diff) | |
| download | nixlib-2ffa48af259c2fc438b16aad1f27557625d7430b.tar nixlib-2ffa48af259c2fc438b16aad1f27557625d7430b.tar.gz nixlib-2ffa48af259c2fc438b16aad1f27557625d7430b.tar.bz2 nixlib-2ffa48af259c2fc438b16aad1f27557625d7430b.tar.lz nixlib-2ffa48af259c2fc438b16aad1f27557625d7430b.tar.xz nixlib-2ffa48af259c2fc438b16aad1f27557625d7430b.tar.zst nixlib-2ffa48af259c2fc438b16aad1f27557625d7430b.zip | |
update maven2
svn path=/nixpkgs/trunk/; revision=18609
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/maven/builder.sh | 8 | ||||
| -rw-r--r-- | pkgs/misc/maven/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/misc/maven/maven-2.nix | 23 |
3 files changed, 6 insertions, 36 deletions
diff --git a/pkgs/misc/maven/builder.sh b/pkgs/misc/maven/builder.sh index 70bb54bbebe8..03e4a0414026 100644 --- a/pkgs/misc/maven/builder.sh +++ b/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 ] diff --git a/pkgs/misc/maven/default.nix b/pkgs/misc/maven/default.nix index cbc0309671e7..857949016504 100644 --- a/pkgs/misc/maven/default.nix +++ b/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; } diff --git a/pkgs/misc/maven/maven-2.nix b/pkgs/misc/maven/maven-2.nix deleted file mode 100644 index 5dc46cf5de8f..000000000000 --- a/pkgs/misc/maven/maven-2.nix +++ /dev/null @@ -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"; - }; -} |