From a40f5bee8a1541bde48619e6adde2c971a0a1bde Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 26 Feb 2008 09:26:17 +0000
Subject: [PATCH] Added jetty 6.1

svn path=/nixpkgs/trunk/; revision=10858
---
 pkgs/servers/http/jetty/6.1/bin-builder.sh |  7 +++++++
 pkgs/servers/http/jetty/6.1/default.nix    | 13 +++++++++++++
 pkgs/top-level/all-packages.nix            |  4 ++++
 3 files changed, 24 insertions(+)
 create mode 100644 pkgs/servers/http/jetty/6.1/bin-builder.sh
 create mode 100644 pkgs/servers/http/jetty/6.1/default.nix

diff --git a/pkgs/servers/http/jetty/6.1/bin-builder.sh b/pkgs/servers/http/jetty/6.1/bin-builder.sh
new file mode 100644
index 000000000000..d19f42eb45cd
--- /dev/null
+++ b/pkgs/servers/http/jetty/6.1/bin-builder.sh
@@ -0,0 +1,7 @@
+set -e
+
+source $stdenv/setup
+
+unzip $src
+ensureDir $out/$name
+mv jetty*/* $out/$name
diff --git a/pkgs/servers/http/jetty/6.1/default.nix b/pkgs/servers/http/jetty/6.1/default.nix
new file mode 100644
index 000000000000..88f3772d3969
--- /dev/null
+++ b/pkgs/servers/http/jetty/6.1/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+  name = "jetty-6.1.3";
+
+  builder = ./bin-builder.sh;
+  buildInputs = [unzip];
+
+  src = fetchurl {
+    url = http://dist.codehaus.org/jetty/jetty-6.1.x/jetty-6.1.3.zip;
+    md5 = "bb39bba9ce017e7cd3996cb3e83e8971";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e642b79e5db3..7c6e1328ee49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3572,6 +3572,10 @@ rec {
     inherit fetchurl stdenv unzip;
   };
 
+  jetty61 = import ../servers/http/jetty/6.1 {
+    inherit fetchurl stdenv unzip;
+  };
+
   mod_python = import ../servers/http/apache-modules/mod_python {
     inherit fetchurl stdenv apacheHttpd python;
   };