From 1a4233d440c2af99d2b2c50ed7fac937b0318e8f Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 6 Nov 2013 14:22:48 +0100 Subject: Bump dysnomia to latest development version --- pkgs/tools/package-management/disnix/dysnomia/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index de3690e3e203..2a5852863f96 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null +, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null , enableApacheWebApplication ? false , enableAxis2WebService ? false , enableEjabberdDump ? false @@ -7,6 +7,7 @@ , enablePostgreSQLDatabase ? false , enableSubversionRepository ? false , enableTomcatWebApplication ? false +, enableMongoDatabase ? false , catalinaBaseDir ? "/var/tomcat" }: @@ -14,12 +15,13 @@ assert enableMySQLDatabase -> mysql != null; assert enablePostgreSQLDatabase -> postgresql != null; assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; +assert enableMongoDatabase -> mongodb != null; stdenv.mkDerivation { - name = "dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz"; + name = "dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484"; src = fetchurl { - url = http://hydra.nixos.org/build/5613342/download/1/dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz; - sha256 = "0ll09vh94ygqkncq4ddb62s4c84n3pr5qy0gi1ywy0j30qk6zvsq"; + url = http://hydra.nixos.org/build/6763096/download/1/dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484.tar.gz; + sha256 = "0k7qpqa9inzxjdryd7zfzxid8k1icsxxw995chzw4wrlgxns16xy"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; @@ -32,13 +34,15 @@ stdenv.mkDerivation { ${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"} ''; buildInputs = [] ++ stdenv.lib.optional enableEjabberdDump ejabberd ++ stdenv.lib.optional enableMySQLDatabase mysql ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql - ++ stdenv.lib.optional enableSubversionRepository subversion; + ++ stdenv.lib.optional enableSubversionRepository subversion + ++ stdenv.lib.optional enableMongoDatabase mongodb; meta = { description = "Automated deployment of mutable components and services for Disnix"; -- cgit 1.4.1