Bump development versions of disnix packages

3 files changed, 20 insertions, 18 deletions

diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index b3e548583ff..04741b984fb 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.3pre9d3acde83aa4283cb6fc26874c524a98f39a5bc6";
+  name = "disnix-0.3precd3288b47c8e7205268d6afb066e21b9d114f797";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/20103891/download/4/disnix-0.3pre9d3acde83aa4283cb6fc26874c524a98f39a5bc6.tar.gz;
-    sha256 = "04ryf4qlw5jv0xjn6pqy5lkxqlynycsgdjin3ivfhq3pm6i0v65l";
+    url = http://hydra.nixos.org/build/20137290/download/4/disnix-0.3precd3288b47c8e7205268d6afb066e21b9d114f797.tar.gz;
+    sha256 = "1n1m4kr9xp60kkrcx92npc6hh3gi36njzxmds7nw9mz0pccqbci1";
   };
   
   buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index cee6f7638fa..656a491a254 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, disnix, socat, pkgconfig, getopt }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.2pre7bbac66b0ed3b637c6ebcfdd8f12055cc330093c";
+  name = "disnixos-0.2preead7dea88dedeb844450afc1f78bb58bd16ac909";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/20062333/download/3/disnixos-0.2pre7bbac66b0ed3b637c6ebcfdd8f12055cc330093c.tar.gz;
-    sha256 = "0d5ql8n93l8xa949cwk7v55lpfcp8j0x8wigqwfh6gim5f21niyb";
+    url = http://hydra.nixos.org/build/20173386/download/3/disnixos-0.2preead7dea88dedeb844450afc1f78bb58bd16ac909.tar.gz;
+    sha256 = "08bkr9lpbfkz0irp4x4v2rgpn6jmm1i6vb29sbnrjdv755yh8q81";
   };
   
   buildInputs = [ socat pkgconfig disnix getopt ];
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index a444a92edd0..cc03972ad08 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -9,6 +9,7 @@
 , enableTomcatWebApplication ? false
 , enableMongoDatabase ? false
 , catalinaBaseDir ? "/var/tomcat"
+, jobTemplate ? "systemd"
 , getopt
 }:
 
@@ -19,24 +20,25 @@ assert enableEjabberdDump -> ejabberd != null;
 assert enableMongoDatabase -> mongodb != null;
 
 stdenv.mkDerivation {
-  name = "dysnomia-0.3pre92a89d735776366633fdea301fdc6dc537009bba";
+  name = "dysnomia-0.3pre87657a43630ffcb9396261d3874b8fd1a89f4c9f";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/20062629/download/1/dysnomia-0.3pre92a89d735776366633fdea301fdc6dc537009bba.tar.gz;
+    url = http://hydra.nixos.org/build/20131278/download/1/dysnomia-0.3pre87657a43630ffcb9396261d3874b8fd1a89f4c9f.tar.gz;
     sha256 = "0dv7ivph2v5j4g5fqdrllxyzmp1hwnsd22n1s61qpkzb6qxaywjj";
   };
   
   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"}
-     ${if enableMongoDatabase then "--with-mongodb" else "--without-mongodb"}
-   '';
+  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")
+     $(if enableMongoDatabase then "--with-mongodb" else "--without-mongodb")
+     "--with-job-template=${jobTemplate}"
+   ];
   
   buildInputs = [ getopt ]
     ++ stdenv.lib.optional enableEjabberdDump ejabberd