- upgrade ant to 1.6.2

- comment out ant15 since nix-env cannot make the distinction
- installation of tomcat 5

svn path=/nixpkgs/trunk/; revision=1299
This commit is contained in:
Eelco Visser
2004-08-20 10:14:55 +00:00
parent f407ca0506
commit 7f3a3764ee
6 changed files with 44 additions and 7 deletions

View File

@@ -0,0 +1,12 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "core-apache-ant-1.6.1";
realname = "apache-ant-1.6.1";
builder = ./core-builder.sh;
src = fetchurl {
url = http://www.apache.org/dist/ant/binaries/apache-ant-1.6.1-bin.tar.bz2;
md5 = "703d0265d05b98afd95be0bc21b98420";
};
}

View File

@@ -1,12 +1,12 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "core-apache-ant-1.6.1";
realname = "apache-ant-1.6.1";
name = "core-apache-ant-1.6.2";
realname = "apache-ant-1.6.2";
builder = ./core-builder.sh;
src = fetchurl {
url = http://www.apache.org/dist/ant/binaries/apache-ant-1.6.1-bin.tar.bz2;
md5 = "703d0265d05b98afd95be0bc21b98420";
url = http://www.apache.org/dist/ant/binaries/apache-ant-1.6.2-bin.tar.bz2 ;
md5 = "a568c7271c3f168771c0313926d060fa";
};
}

View File

@@ -3,7 +3,7 @@
# unpack the binary distribution
tar jxf $src || exit 1
mkdir -p $out
mv apache-ant-1.6.1/* $out || exit 1
mv apache-ant-*/* $out || exit 1
# remove crap in the root directory