* Updated Tomcat to 5.0.27.

svn path=/nixpkgs/trunk/; revision=24066

+17 -15
+16 -8
pkgs/servers/http/tomcat/6.0.nix
··· 1 - {stdenv, fetchurl, jdk}: 2 - 3 - stdenv.mkDerivation { 1 + { stdenv, fetchurl }: 4 2 5 - name = "apache-tomcat-6.0.26"; 3 + let version = "6.0.29"; in 6 4 7 - builder = ./builder-6.0.sh; 5 + stdenv.mkDerivation rec { 6 + name = "apache-tomcat-${version}"; 8 7 9 8 src = fetchurl { 10 - url = http://apache.proserve.nl/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.tar.gz; 11 - sha256 = "0rxaz7wkw6xas9f2jslb6kp1prllhpqmq7c3h0ig19j146mrjbls"; 9 + url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz"; 10 + sha256 = "0v96wmd4fnk3qskw32k8mb77f7yssqqinsrf9sir672l5ggmmcjc"; 12 11 }; 13 12 14 - inherit jdk; 13 + installPhase = 14 + '' 15 + mkdir $out 16 + mv * $out 17 + ''; 18 + 19 + meta = { 20 + homepage = http://tomcat.apache.org/; 21 + description = "An implementation of the Java Servlet and JavaServer Pages technologies"; 22 + }; 15 23 }
-6
pkgs/servers/http/tomcat/builder-6.0.sh
··· 1 - source $stdenv/setup 2 - 3 - tar zxf $src 4 - 5 - mkdir $out 6 - mv apache-tomcat-*/* $out
pkgs/servers/http/tomcat/default.nix pkgs/servers/http/tomcat/5.0.nix
+1 -1
pkgs/top-level/all-packages.nix
··· 4241 4241 }); 4242 4242 squid = squids.squid3Beta; # has ipv6 support 4243 4243 4244 - tomcat5 = callPackage ../servers/http/tomcat { }; 4244 + tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; 4245 4245 4246 4246 tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { }; 4247 4247