From 1bf1500d3993f9040e676c4d5a679499ebbb2951 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 22 Apr 2010 14:01:57 +0000
Subject: [PATCH] Added Apache Felix gateway and remote shell packages

svn path=/nixpkgs/trunk/; revision=21240
---
 pkgs/servers/felix/default.nix     | 22 ++++++++++++++++++++++
 pkgs/servers/felix/remoteshell.nix | 14 ++++++++++++++
 pkgs/top-level/all-packages.nix    |  8 ++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/servers/felix/default.nix
 create mode 100644 pkgs/servers/felix/remoteshell.nix

diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix
new file mode 100644
index 00000000000..c600573ba86
--- /dev/null
+++ b/pkgs/servers/felix/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "apache-felix-2.0.5";
+  src = fetchurl {
+    url = http://apache.xl-mirror.nl/felix/org.apache.felix.main.distribution-2.0.5.tar.gz;
+    sha256 = "14nva0q1b45kmmalcls5yx97syd4vn3vcp8gywck1098qhidi66g";
+  };
+  buildCommand =
+  ''
+    tar xfvz $src
+    cd felix-framework-*
+    ensureDir $out
+    cp -av * $out
+  '';
+  meta = {
+    description = "Apache Felix OSGi gateway";
+    homepage = http://felix.apache.org;
+    license = "ASF";
+    maintainers = [ stdenv.lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/servers/felix/remoteshell.nix
new file mode 100644
index 00000000000..4d6a8d8318f
--- /dev/null
+++ b/pkgs/servers/felix/remoteshell.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "apache-felix-remoteshell-bundle-1.0.4";
+  src = fetchurl {
+    url = http://apache.proserve.nl/felix/org.apache.felix.shell.remote-1.0.4.jar;
+    sha256 = "1bgahzs9nnnvfr0yyh9s0r6h1zp2ls6533377rp8r1qk2a4s1gzb";
+  };
+  buildCommand = 
+  ''
+    ensureDir $out/bundle
+    cp ${src} $out/bundle/org.apache.felix.shell.remote-1.0.4.jar
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 607e59f1a5e..e8b5c14c896 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5476,6 +5476,14 @@ let
     inherit fetchurl stdenv erlang spidermonkey icu getopt
       curl;
   };
+  
+  felix = import ../servers/felix {
+    inherit stdenv fetchurl;
+  };
+  
+  felix_remoteshell = import ../servers/felix/remoteshell.nix {
+    inherit stdenv fetchurl;
+  };
 
   fingerd_bsd = import ../servers/fingerd/bsd-fingerd {
     inherit fetchurl stdenv;