diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-07 21:21:31 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-07 21:21:31 +0000 |
| commit | fca582bff0ab8887835ca10495620d0ac15ab10a (patch) | |
| tree | 0934656b725b9a5da0acb8025f3a9ceab2e63d90 /pkgs/servers/http/tomcat | |
| parent | 2291f661b03f29fd59549165721a1426e5d04264 (diff) | |
| parent | 89a3dc9adac5aa195ec9334c2f7e255e02388157 (diff) | |
| download | nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.gz nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.bz2 nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.lz nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.xz nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.zst nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.zip | |
Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
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 |