disnix: push to latest 0.3 development release

pkgs/tools/package-management/disnix/activation-scripts/default.nix

@@ -1,48 +0,0 @@
-{ stdenv, fetchurl
-, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null
-, enableApacheWebApplication ? false
-, enableAxis2WebService ? false
-, enableEjabberdDump ? false
-, enableMySQLDatabase ? false
-, enablePostgreSQLDatabase ? false
-, enableSubversionRepository ? false
-, enableTomcatWebApplication ? false
-, catalinaBaseDir ? "/var/tomcat"
-}:
-
-assert enableMySQLDatabase -> mysql != null;
-assert enablePostgreSQLDatabase -> postgresql != null;
-assert enableSubversionRepository -> subversion != null;
-assert enableEjabberdDump -> ejabberd != null;
-
-stdenv.mkDerivation {
-  name = "disnix-activation-scripts-0.3pre30423";
-  src = fetchurl {
-    url = http://hydra.nixos.org/build/2794103/download/1/disnix-activation-scripts-0.3pre30423.tar.gz;
-    sha256 = "1x1702isjnrkvwzycryc8rvjgka4qqmd1dk34pwl51y1l2bxymrx";
-  };
-  
-  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 enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"}
-		     ${if enableSubversionRepository then "--with-subversion" else "--without-subversion"}
-		     ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"}
-		   '';
-		   
-  buildInputs = []
-                ++ stdenv.lib.optional enableEjabberdDump ejabberd
-                ++ stdenv.lib.optional enableMySQLDatabase mysql
-		++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
-		++ stdenv.lib.optional enableSubversionRepository subversion;
-
-  meta = {
-    description = "Provides various activation types for Disnix";
-    license = "MIT";
-    maintainers = [ stdenv.lib.maintainers.sander ];
-  };
-}

pkgs/tools/package-management/disnix/default.nix

@@ -1,17 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv }:
+{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, libintlOrEmpty, libiconvOrEmpty }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.3pre32254";
+  name = "disnix-0.3pre106668a42f982af4180d7657b47d8316862d4d1d";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/2368541/download/4/disnix-0.3pre32254.tar.gz;
-    sha256 = "1jznx4mb6vwpzzpbk4c16j73hjgng7v1nraq8yya7f7m1s2gyhcw";
+    url = http://hydra.nixos.org/build/5430218/download/4/disnix-0.3pre106668a42f982af4180d7657b47d8316862d4d1d.tar.gz;
+    sha256 = "1cnrbw70gpkm9rg5a3j0kkbq0q0wrkc5hwqb614fvja20y52hld6";
   };
   
-  buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]
-                ++ stdenv.lib.optional (!stdenv.isLinux) libiconv
-                ++ stdenv.lib.optional (!stdenv.isLinux) gettext;
-                
+  buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty ];
+
   dontStrip = true;
   
   meta = {

pkgs/tools/package-management/disnix/disnixos/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, disnix, socat, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.2pre33586";
+  name = "disnixos-0.2pre827a5b52b8a68b7c16a2d92898e6281c54e7b1ff";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/2368187/download/3/disnixos-0.2pre33586.tar.gz;
-    sha256 = "110vn4390447dws343py8ss6s8jizx8yg7yl38i64nlqh0bcn4ny";
+    url = http://hydra.nixos.org/build/5430738/download/3/disnixos-0.2pre827a5b52b8a68b7c16a2d92898e6281c54e7b1ff.tar.gz;
+    sha256 = "1alyzypli32whd371w9wfxcnq6by9zng88nysd3gy8nrvns8di7x";
   };
   
   buildInputs = [ socat pkgconfig disnix ];

pkgs/tools/package-management/disnix/dysnomia/default.nix

@@ -0,0 +1,48 @@
+{ stdenv, fetchurl
+, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null
+, enableApacheWebApplication ? false
+, enableAxis2WebService ? false
+, enableEjabberdDump ? false
+, enableMySQLDatabase ? false
+, enablePostgreSQLDatabase ? false
+, enableSubversionRepository ? false
+, enableTomcatWebApplication ? false
+, catalinaBaseDir ? "/var/tomcat"
+}:
+
+assert enableMySQLDatabase -> mysql != null;
+assert enablePostgreSQLDatabase -> postgresql != null;
+assert enableSubversionRepository -> subversion != null;
+assert enableEjabberdDump -> ejabberd != null;
+
+stdenv.mkDerivation {
+  name = "disnix-activation-scripts-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03";
+  src = fetchurl {
+    url = http://hydra.nixos.org/build/5430159/download/1/dysnomia-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03.tar.gz;
+    sha256 = "1y9qf14ygdgq2hjh1p6rf7hcgij02wv091s8wpsn36mrmc9zk6rf";
+  };
+  
+  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 enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"}
+     ${if enableSubversionRepository then "--with-subversion" else "--without-subversion"}
+     ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"}
+   '';
+  
+  buildInputs = []
+    ++ stdenv.lib.optional enableEjabberdDump ejabberd
+    ++ stdenv.lib.optional enableMySQLDatabase mysql
+    ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
+    ++ stdenv.lib.optional enableSubversionRepository subversion;
+
+  meta = {
+    description = "Provides various activation types for Disnix";
+    license = "MIT";
+    maintainers = [ stdenv.lib.maintainers.sander ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -9433,7 +9433,7 @@ let
 
   disnix = callPackage ../tools/package-management/disnix { };
 
-  disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts {
+  dysnomia = callPackage ../tools/package-management/disnix/dysnomia {
     enableApacheWebApplication = config.disnix.enableApacheWebApplication or false;
     enableAxis2WebService = config.disnix.enableAxis2WebService or false;
     enableEjabberdDump = config.disnix.enableEjabberdDump or false;