Updated OpenFire

svn path=/nixpkgs/trunk/; revision=15002

2 files changed, 7 insertions, 37 deletions

diff --git a/pkgs/servers/xmpp/openfire/3.5.2.nix b/pkgs/servers/xmpp/openfire/3.5.2.nix
deleted file mode 100644
index 30e44b5771f..00000000000
--- a/pkgs/servers/xmpp/openfire/3.5.2.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-args : with args; with builderDefs;
-  let localDefs = builderDefs.passthru.function (rec {
-    src = /* put a fetchurl here */
-    fetchurl {
-      url = http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_3_5_2.tar.gz;
-      sha256 = "13xzwl8kc8i8xgdv7fpwgkj1wjhzagx4b03fkkj2hcfgdkp1978q";
-    };
-
-    buildInputs = [jre];
-    configureFlags = [];
-
-    installPhase = FullDepEntry (''
-      sed -e 's@\(common_jvm_locations\)=.*@\1${jre}@' -i bin/openfire
-      cp -r . $out
-      rm -r $out/logs
-      mv $out/conf $out/conf.inst
-      ln -s /var/log/openfire $out/logs
-      ln -s /etc/openfire $out/conf
-    '') 
-    ["minInit" "doUnpack" "addInputs"];
-  });
-  in with localDefs;
-stdenv.mkDerivation rec {
-  name = "openfire-"+version;
-  builder = writeScript (name + "-builder")
-    (textClosure localDefs 
-      [ installPhase doForceShare doPropagate]);
-  meta = {
-    description = "XMPP server in Java";
-    inherit src;
-  };
-}
diff --git a/pkgs/servers/xmpp/openfire/3.4.5.nix b/pkgs/servers/xmpp/openfire/default.nix
index a8d7360d8d6..5319e7ce231 100644
--- a/pkgs/servers/xmpp/openfire/3.4.5.nix
+++ b/pkgs/servers/xmpp/openfire/default.nix
@@ -1,10 +1,12 @@
 args : with args; with builderDefs;
-  let localDefs = builderDefs.passthru.function (rec {
+  let 
+    version="3_6_3";
+    localDefs = builderDefs.passthru.function (rec {
     src = /* put a fetchurl here */
-    fetchurl {
-      url = http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_3_4_5.tar.gz;
-      sha256 = "0j1ddk0wiqxhbi3872vf2mqx0jynswrvbfbabrp73zqhz3mdvsal";
-    };
+      fetchurl {
+        url = "http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_${version}.tar.gz";
+        sha256 = "0ibzhmh9qw4lmx45ir1i280p30npgwnj7vrkl432kj3zi7hp79q2";
+      };
 
     buildInputs = [jre];
     configureFlags = [];