From 75ae1c3a58a6d0ba538c49f467fd0741fedcd262 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 30 Jan 2008 09:41:33 +0000
Subject: [PATCH] Added Apache Tomcat 6.0

svn path=/nixpkgs/trunk/; revision=10400
---
 pkgs/servers/http/tomcat/6.0.nix        | 15 +++++++++++++++
 pkgs/servers/http/tomcat/builder-6.0.sh |  6 ++++++
 pkgs/top-level/all-packages.nix         |  4 ++++
 3 files changed, 25 insertions(+)
 create mode 100644 pkgs/servers/http/tomcat/6.0.nix
 create mode 100644 pkgs/servers/http/tomcat/builder-6.0.sh

diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix
new file mode 100644
index 00000000000..32a3dedde47
--- /dev/null
+++ b/pkgs/servers/http/tomcat/6.0.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, jdk}:
+
+stdenv.mkDerivation {
+
+  name = "apache-tomcat-6.0.14";
+
+  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";
+  };
+
+  inherit jdk;
+}
diff --git a/pkgs/servers/http/tomcat/builder-6.0.sh b/pkgs/servers/http/tomcat/builder-6.0.sh
new file mode 100644
index 00000000000..ae2f934af59
--- /dev/null
+++ b/pkgs/servers/http/tomcat/builder-6.0.sh
@@ -0,0 +1,6 @@
+source $stdenv/setup
+
+tar zxf $src
+
+mkdir $out
+mv apache-tomcat*/* $out
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29f51c908d7..ed68c349e69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3230,6 +3230,10 @@ rec {
     inherit fetchurl stdenv jdk;
   };
 
+  tomcat6 = import ../servers/http/tomcat/6.0.nix {
+    inherit fetchurl stdenv jdk;
+  };
+
   vsftpd = import ../servers/ftp/vsftpd {
     inherit fetchurl openssl ;
     stdenv = overrideGCC stdenv gcc295 ;