diff options
| author | Eelco Visser <visser@acm.org> | 2004-08-20 10:14:55 +0000 |
|---|---|---|
| committer | Eelco Visser <visser@acm.org> | 2004-08-20 10:14:55 +0000 |
| commit | 7f3a3764eed4c03f1b0ad491135b2cf0133cb57d (patch) | |
| tree | 819b88e2cd667865e9beb54f61f6b15b0f6c12c0 /pkgs/development/tools/build-managers/apache-ant | |
| parent | f407ca0506a20dc8cd81a2c93134dd04eae2a835 (diff) | |
| download | nixlib-7f3a3764eed4c03f1b0ad491135b2cf0133cb57d.tar nixlib-7f3a3764eed4c03f1b0ad491135b2cf0133cb57d.tar.gz nixlib-7f3a3764eed4c03f1b0ad491135b2cf0133cb57d.tar.bz2 nixlib-7f3a3764eed4c03f1b0ad491135b2cf0133cb57d.tar.lz nixlib-7f3a3764eed4c03f1b0ad491135b2cf0133cb57d.tar.xz nixlib-7f3a3764eed4c03f1b0ad491135b2cf0133cb57d.tar.zst nixlib-7f3a3764eed4c03f1b0ad491135b2cf0133cb57d.zip | |
- 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
Diffstat (limited to 'pkgs/development/tools/build-managers/apache-ant')
3 files changed, 17 insertions, 5 deletions
diff --git a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix new file mode 100644 index 000000000000..070cc4071ad3 --- /dev/null +++ b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix @@ -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"; + }; +} diff --git a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix index 070cc4071ad3..a5fec1fdfd00 100644 --- a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix +++ b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix @@ -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"; }; } diff --git a/pkgs/development/tools/build-managers/apache-ant/core-builder.sh b/pkgs/development/tools/build-managers/apache-ant/core-builder.sh index d7fffdabf00e..e06c6a2d2ca8 100644 --- a/pkgs/development/tools/build-managers/apache-ant/core-builder.sh +++ b/pkgs/development/tools/build-managers/apache-ant/core-builder.sh @@ -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 |