diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-10-05 10:39:12 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-10-05 10:39:12 +0000 |
| commit | 0bd5f00696dead2c976be4b180e9dc3dd2ea14e4 (patch) | |
| tree | ccccb55f0a4d01d78c466a99e612c0bd40e9b566 /pkgs/servers/http/tomcat | |
| parent | 80607fd2851869c98955aa39b3521cb587acee69 (diff) | |
| download | nixlib-0bd5f00696dead2c976be4b180e9dc3dd2ea14e4.tar nixlib-0bd5f00696dead2c976be4b180e9dc3dd2ea14e4.tar.gz nixlib-0bd5f00696dead2c976be4b180e9dc3dd2ea14e4.tar.bz2 nixlib-0bd5f00696dead2c976be4b180e9dc3dd2ea14e4.tar.lz nixlib-0bd5f00696dead2c976be4b180e9dc3dd2ea14e4.tar.xz nixlib-0bd5f00696dead2c976be4b180e9dc3dd2ea14e4.tar.zst nixlib-0bd5f00696dead2c976be4b180e9dc3dd2ea14e4.zip | |
* Updated Tomcat to 5.0.27.
svn path=/nixpkgs/trunk/; revision=24066
Diffstat (limited to 'pkgs/servers/http/tomcat')
| -rw-r--r-- | pkgs/servers/http/tomcat/5.0.nix (renamed from pkgs/servers/http/tomcat/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/servers/http/tomcat/6.0.nix | 24 | ||||
| -rw-r--r-- | pkgs/servers/http/tomcat/builder-6.0.sh | 6 |
3 files changed, 16 insertions, 14 deletions
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/5.0.nix index c15604cb0ae0..c15604cb0ae0 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/5.0.nix diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix index 256612f94fc8..317634d9ab46 100644 --- a/pkgs/servers/http/tomcat/6.0.nix +++ b/pkgs/servers/http/tomcat/6.0.nix @@ -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"; + }; } diff --git a/pkgs/servers/http/tomcat/builder-6.0.sh b/pkgs/servers/http/tomcat/builder-6.0.sh deleted file mode 100644 index bcb56ee61d83..000000000000 --- a/pkgs/servers/http/tomcat/builder-6.0.sh +++ /dev/null @@ -1,6 +0,0 @@ -source $stdenv/setup - -tar zxf $src - -mkdir $out -mv apache-tomcat-*/* $out |