alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

- upgrade ant to 1.6.2

Browse source 
- 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
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/tools/build-managers/apache-ant/core-apache-ant-1.6.1.nix Normal file
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";
};
}

8
pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
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";
};
}

2
pkgs/development/tools/build-managers/apache-ant/core-builder.sh
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

5
pkgs/servers/http/tomcat/builder.sh Normal file
View file

@ -0,0 +1,5 @@
. $stdenv/setup || exit 1
tar zxf $src
mkdir $out
mv jakarta-tomcat* $out

16
pkgs/servers/http/tomcat/default.nix Normal file
View file

@ -0,0 +1,16 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "jakarta-tomcat-5.0.27";
builder = ./builder.sh;
src = fetchurl {
url = http://apache.essentkabel.com/jakarta/tomcat-5/v5.0.27/bin/jakarta-tomcat-5.0.27.tar.gz;
md5 = "b802ee042677e284bcf65738c7bdc3b6";
};
}

8
pkgs/system/all-packages-generic.nix
View file

@ -384,9 +384,13 @@ rec {
inherit fetchurl stdenv j2sdk;
};
apacheant15 = (import ../development/tools/build-managers/apache-ant) {
# apacheant15 = (import ../development/tools/build-managers/apache-ant) {
# inherit fetchurl stdenv;
# j2sdk = j2sdk15;
# };
tomcat5 = (import ../servers/http/tomcat) {
inherit fetchurl stdenv;
j2sdk = j2sdk15;
};
pcre = (import ../development/libraries/pcre) {