public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update maven2

Browse Source 
svn path=/nixpkgs/trunk/; revision=18609
This commit is contained in:
Rob Vermaas 2009-11-25 07:51:06 +00:00
parent f52952e504
commit 2ffa48af25
4 changed files with 8 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/misc/maven/builder.sh
View File

@ -1,17 +1,11 @@
source $stdenv/setup source $stdenv/setup
source $makeWrapper
unpackPhase unpackPhase
mkdir -p $out mkdir -p $out
cp -r $name/* $out cp -r $name/* $out
# Make a backup of the original directory wrapProgram $out/bin/mvn --set JAVA_HOME "$jdk"
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"
# Add the maven-axis and JIRA plugin by default when using maven 1.x # Add the maven-axis and JIRA plugin by default when using maven 1.x
if [ -e $out/bin/maven ] if [ -e $out/bin/maven ]

11
pkgs/misc/maven/default.nix
View File

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

23
pkgs/misc/maven/maven-2.nix
View File

@ -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";
};
}

6
pkgs/top-level/all-packages.nix
View File

@ -8294,10 +8294,8 @@ let
inherit stdenv fetchurl jdk; inherit stdenv fetchurl jdk;
}; };
# don't have time for the source build right now maven2 = import ../misc/maven {
# maven2 inherit stdenv fetchurl jdk makeWrapper;
mvn_bin = import ../misc/maven/maven-2.nix {
inherit fetchurl stdenv unzip;
}; };
nix = makeOverridable (import ../tools/package-management/nix) { nix = makeOverridable (import ../tools/package-management/nix) {