- Renamed DisnixService => DisnixWebService

- Updated to latest unstable version


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

5 files changed, 49 insertions, 48 deletions

diff --git a/pkgs/tools/package-management/disnix/DisnixService/builder.sh b/pkgs/tools/package-management/disnix/DisnixService/builder.sh
deleted file mode 100644
index 78fe9e55adf3..000000000000
--- a/pkgs/tools/package-management/disnix/DisnixService/builder.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-source $stdenv/setup
-
-# Fix permissions
-cp -av $src/* .
-find . -type f | while read i
-do
-    chmod 644 "$i"
-done
-find . -type d | while read i
-do
-    chmod 755 "$i"
-done
-
-export AXIS2_LIB=$axis2/share/java/axis2
-
-# Deploy webservice
-ant generate.library.jar
-ant generate.service.aar
-ensureDir $out/shared/lib
-cp *.jar *.so $out/shared/lib
-chmod 755 $out/shared/lib/*.so
-ensureDir $out/webapps/axis2/WEB-INF/services
-cp DisnixService.aar $out/webapps/axis2/WEB-INF/services
-
-# Deploy client
-ant generate.client.jar
-ensureDir $out/bin
-for i in disnix-soap-*
-do
-    sed -i -e "s|AXIS2_LIBDIR=|AXIS2_LIBDIR=$axis2/share/java/axis2|" $i
-    shebangfix $i
-done
-cp disnix-soap-* DisnixClient.jar jargs.jar *.nix builder.sh $out/bin
-chmod 755 $out/bin/disnix-soap-*
diff --git a/pkgs/tools/package-management/disnix/DisnixService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index 1aece5650999..ef6f9300c425 100644
--- a/pkgs/tools/package-management/disnix/DisnixService/default.nix
+++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}:
 
 stdenv.mkDerivation {
-  name = "DisnixService-0.1";
+  name = "DisnixWebService-0.2";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/337920/download/1/DisnixService-0.1.tar.bz2;
-    sha256 = "18526dh5axmicbahwma2m71hw7j0nkxmmhgl4kd76r61wdiiblx7";
+    url = http://hydra.nixos.org/build/716007/download/1/DisnixWebService-0.2.tar.bz2;
+    sha256 = "0a6l9dhi20d67bddzgqi15i00xvrxacpmfbn5a0nscp2izzbvmdr";
   };
   buildInputs = [ apacheAnt ];
   PREFIX = ''''${env.out}'';
diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix
index 2719e611b1a7..e214206d891b 100644
--- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix
+++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix
@@ -1,9 +1,34 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl
+, ejabberd ? null, mysql ? null
+, enableApacheWebApplication ? false
+, enableAxis2WebService ? false
+, enableEjabberdDump ? false
+, enableMySQLDatabase ? false
+, enableTomcatWebApplication ? false
+, catalinaBaseDir ? "/var/tomcat"
+}:
+
+assert enableMySQLDatabase -> mysql != null;
+assert enableEjabberdDump -> ejabberd != null;
 
 stdenv.mkDerivation {
-  name = "disnix-activation-scripts-test";
+  name = "disnix-activation-scripts-0.2pre24557";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/333630/download/1/disnix-activation-scripts-nixos-0.1.tar.gz;
-    sha256 = "0izkkdw9r2gff03mq973ah5b9b0a4b07l8ac0406yv8ss9vaaclm";
+    url = http://hydra.nixos.org/build/727573/download/1/disnix-activation-scripts-0.2pre24557.tar.gz;
+    sha256 = "089bp700rjdxfa0wzf81420i5iphs78kkz41506ibsfnbm8k3axj";
   };
+  
+  preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
+  
+  configureFlags = ''
+                     ${if enableApacheWebApplication then "--with-apache" else "--without-apache"}
+		     ${if enableAxis2WebService then "--with-axis2" else "--without-axis2"}
+		     ${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"}
+		     ${if enableMySQLDatabase then "--with-mysql" else "--without-mysql"}
+		     ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"}
+		   '';
+		   
+  buildInputs = []
+                ++ stdenv.lib.optional enableEjabberdDump ejabberd
+                ++ stdenv.lib.optional enableMySQLDatabase mysql;
 }
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index e9b9e722c87b..adb1dcc0dd63 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,10 +1,14 @@
-{stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable}:
+{stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv}:
 
 stdenv.mkDerivation {
-  name = "disnix-0.1";
+  name = "disnix-0.2pre24517";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/334661/download/1/disnix-0.1.tar.gz;
-    sha256 = "0qiskbgn49dihhicczsbjandwjnz04yhnlxgwjinkcyfzsh4yqdp";
+    url = http://hydra.nixos.org/build/720966/download/3/disnix-0.2pre24517.tar.gz;
+    sha256 = "03d2w9kckk8hy2xrywb5mk5qiyd9kjxabihv1rjnc3grlzi053k4";
   };
-  buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ];
+  buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]
+                ++ stdenv.lib.optional (!stdenv.isLinux) libiconv
+		++ stdenv.lib.optional (!stdenv.isLinux) gettext;
+  dontStrip = true;
+  NIX_STRIP_DEBUG = true;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27bfb20288c8..4c6337ddb302 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7037,9 +7037,15 @@ let
 
   disnix = callPackage ../tools/package-management/disnix { };
 
-  disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts { };
+  disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts {
+    enableApacheWebApplication = getConfig ["disnix" "enableApacheWebApplication"] false;
+    enableAxis2WebService = getConfig ["disnix" "enableAxis2WebService"] false;
+    enableEjabberdDump = getConfig ["disnix" "enableEjabberdDump"] false;
+    enableMySQLDatabase = getConfig ["disnix" "enableMySQLDatabase"] false;
+    enableTomcatWebApplication = getConfig ["disnix" "enableTomcatWebApplication"] false;
+  };
 
-  DisnixService = callPackage ../tools/package-management/disnix/DisnixService { };
+  DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { };
 
   latex2html = callPackage ../misc/tex/latex2html/default.nix {
     tex = tetex;