diff options
| author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2008-07-06 20:08:27 +0000 |
|---|---|---|
| committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2008-07-06 20:08:27 +0000 |
| commit | 927898b6f1e765aa4b4a247c832d496175e6cb99 (patch) | |
| tree | e3e8686436a0540de5b548a0db9aaff8a6e796fc /pkgs/servers | |
| parent | 70b50b9f52d1e628e051f4f688850ba40e6f4bd8 (diff) | |
| download | nixlib-927898b6f1e765aa4b4a247c832d496175e6cb99.tar nixlib-927898b6f1e765aa4b4a247c832d496175e6cb99.tar.gz nixlib-927898b6f1e765aa4b4a247c832d496175e6cb99.tar.bz2 nixlib-927898b6f1e765aa4b4a247c832d496175e6cb99.tar.lz nixlib-927898b6f1e765aa4b4a247c832d496175e6cb99.tar.xz nixlib-927898b6f1e765aa4b4a247c832d496175e6cb99.tar.zst nixlib-927898b6f1e765aa4b4a247c832d496175e6cb99.zip | |
Minor update to tomcat and added support for shared libraries
svn path=/nixpkgs/trunk/; revision=12285
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/tomcat/6.0.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/http/tomcat/builder-6.0.sh | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix index 32a3dedde472..7ab5ebcb3b3a 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.14"; + name = "apache-tomcat-6.0.16"; builder = ./builder-6.0.sh; src = fetchurl { - url = http://apache.mirrors.webazilla.nl/tomcat/tomcat-6/v6.0.14/bin/apache-tomcat-6.0.14.tar.gz; - md5 = "3b18ff250d8172737c4f67f11631f68a"; + url = http://apache.mirrors.webazilla.nl/tomcat/tomcat-6/v6.0.16/bin/apache-tomcat-6.0.16.tar.gz; + md5 = "4985fed02341a9e04ea43e91e6444ace"; }; inherit jdk; diff --git a/pkgs/servers/http/tomcat/builder-6.0.sh b/pkgs/servers/http/tomcat/builder-6.0.sh index ae2f934af596..040d45171e31 100644 --- a/pkgs/servers/http/tomcat/builder-6.0.sh +++ b/pkgs/servers/http/tomcat/builder-6.0.sh @@ -4,3 +4,4 @@ tar zxf $src mkdir $out mv apache-tomcat*/* $out +sed -i -e 's|shared.loader=|shared.loader=${catalina.home}/shared/lib/*.jar|' $out/conf/catalina.properties |