* Updated Tomcat to 5.0.27.

svn path=/nixpkgs/trunk/; revision=24066
This commit is contained in:
Eelco Dolstra 2010-10-05 10:39:12 +00:00
parent 80607fd285
commit 0bd5f00696
4 changed files with 17 additions and 15 deletions

View file

@ -1,15 +1,23 @@
{stdenv, fetchurl, jdk}:
{ stdenv, fetchurl }:
stdenv.mkDerivation {
let version = "6.0.29"; in
name = "apache-tomcat-6.0.26";
builder = ./builder-6.0.sh;
stdenv.mkDerivation rec {
name = "apache-tomcat-${version}";
src = fetchurl {
url = http://apache.proserve.nl/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.tar.gz;
sha256 = "0rxaz7wkw6xas9f2jslb6kp1prllhpqmq7c3h0ig19j146mrjbls";
url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz";
sha256 = "0v96wmd4fnk3qskw32k8mb77f7yssqqinsrf9sir672l5ggmmcjc";
};
inherit jdk;
installPhase =
''
mkdir $out
mv * $out
'';
meta = {
homepage = http://tomcat.apache.org/;
description = "An implementation of the Java Servlet and JavaServer Pages technologies";
};
}

View file

@ -1,6 +0,0 @@
source $stdenv/setup
tar zxf $src
mkdir $out
mv apache-tomcat-*/* $out

View file

@ -4241,7 +4241,7 @@ let
});
squid = squids.squid3Beta; # has ipv6 support
tomcat5 = callPackage ../servers/http/tomcat { };
tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };