diff options
| author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2009-08-06 17:15:38 +0000 |
|---|---|---|
| committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2009-08-06 17:15:38 +0000 |
| commit | d8e017cbb355d1c370beac8862b72d67586b2270 (patch) | |
| tree | 5770831b6dc1e2d70a341d0bff45b8863af9d616 /pkgs/servers/http/tomcat | |
| parent | f33f18439f9d7e061c852c7b24550172d3a294b7 (diff) | |
| download | nixlib-d8e017cbb355d1c370beac8862b72d67586b2270.tar nixlib-d8e017cbb355d1c370beac8862b72d67586b2270.tar.gz nixlib-d8e017cbb355d1c370beac8862b72d67586b2270.tar.bz2 nixlib-d8e017cbb355d1c370beac8862b72d67586b2270.tar.lz nixlib-d8e017cbb355d1c370beac8862b72d67586b2270.tar.xz nixlib-d8e017cbb355d1c370beac8862b72d67586b2270.tar.zst nixlib-d8e017cbb355d1c370beac8862b72d67586b2270.zip | |
Upgraded tomcat to 6.0.20
svn path=/nixpkgs/trunk/; revision=16600
Diffstat (limited to 'pkgs/servers/http/tomcat')
| -rw-r--r-- | pkgs/servers/http/tomcat/6.0.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/http/tomcat/builder-6.0.sh | 9 |
2 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix index 00907844ba89..4fe906bedd08 100644 --- a/pkgs/servers/http/tomcat/6.0.nix +++ b/pkgs/servers/http/tomcat/6.0.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { - name = "apache-tomcat-6.0.18"; + name = "apache-tomcat-6.0.20"; builder = ./builder-6.0.sh; src = fetchurl { - url = http://apache.mirrors.webazilla.nl/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.tar.gz; - md5 = "8354e156f097158f8d7b699078fd39c1"; + url = http://apache.mirrors.webazilla.nl/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20.tar.gz; + sha256 = "0vh48rvbynawivqm3hs7453527g8qns9kcj7vmihjpf21mrc2hx4"; }; inherit jdk; diff --git a/pkgs/servers/http/tomcat/builder-6.0.sh b/pkgs/servers/http/tomcat/builder-6.0.sh index 001fade38809..bcb56ee61d83 100644 --- a/pkgs/servers/http/tomcat/builder-6.0.sh +++ b/pkgs/servers/http/tomcat/builder-6.0.sh @@ -3,11 +3,4 @@ source $stdenv/setup tar zxf $src mkdir $out -mv apache-tomcat*/* $out - -# Rename the context.xml to context.xml.default in order to allow a custom context.xml -mv $out/conf/context.xml $out/conf/context.xml.default - -# Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries -sed -i -e 's|${catalina.home}|${catalina.base}|g' \ - -e 's|shared.loader=|shared.loader=${catalina.base}/shared/lib/*.jar|' $out/conf/catalina.properties +mv apache-tomcat-*/* $out |