Bump dysnomia to latest development version
This commit is contained in:
parent
58af4fb11e
commit
1a4233d440
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchurl
|
{ stdenv, fetchurl
|
||||||
, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null
|
, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null
|
||||||
, enableApacheWebApplication ? false
|
, enableApacheWebApplication ? false
|
||||||
, enableAxis2WebService ? false
|
, enableAxis2WebService ? false
|
||||||
, enableEjabberdDump ? false
|
, enableEjabberdDump ? false
|
||||||
@ -7,6 +7,7 @@
|
|||||||
, enablePostgreSQLDatabase ? false
|
, enablePostgreSQLDatabase ? false
|
||||||
, enableSubversionRepository ? false
|
, enableSubversionRepository ? false
|
||||||
, enableTomcatWebApplication ? false
|
, enableTomcatWebApplication ? false
|
||||||
|
, enableMongoDatabase ? false
|
||||||
, catalinaBaseDir ? "/var/tomcat"
|
, catalinaBaseDir ? "/var/tomcat"
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -14,12 +15,13 @@ assert enableMySQLDatabase -> mysql != null;
|
|||||||
assert enablePostgreSQLDatabase -> postgresql != null;
|
assert enablePostgreSQLDatabase -> postgresql != null;
|
||||||
assert enableSubversionRepository -> subversion != null;
|
assert enableSubversionRepository -> subversion != null;
|
||||||
assert enableEjabberdDump -> ejabberd != null;
|
assert enableEjabberdDump -> ejabberd != null;
|
||||||
|
assert enableMongoDatabase -> mongodb != null;
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz";
|
name = "dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://hydra.nixos.org/build/5613342/download/1/dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz;
|
url = http://hydra.nixos.org/build/6763096/download/1/dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484.tar.gz;
|
||||||
sha256 = "0ll09vh94ygqkncq4ddb62s4c84n3pr5qy0gi1ywy0j30qk6zvsq";
|
sha256 = "0k7qpqa9inzxjdryd7zfzxid8k1icsxxw995chzw4wrlgxns16xy";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
|
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 enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"}
|
||||||
${if enableSubversionRepository then "--with-subversion" else "--without-subversion"}
|
${if enableSubversionRepository then "--with-subversion" else "--without-subversion"}
|
||||||
${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"}
|
${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"}
|
||||||
|
${if enableMongoDatabase then "--with-mongodb" else "--without-mongodb"}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = []
|
buildInputs = []
|
||||||
++ stdenv.lib.optional enableEjabberdDump ejabberd
|
++ stdenv.lib.optional enableEjabberdDump ejabberd
|
||||||
++ stdenv.lib.optional enableMySQLDatabase mysql
|
++ stdenv.lib.optional enableMySQLDatabase mysql
|
||||||
++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
|
++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
|
||||||
++ stdenv.lib.optional enableSubversionRepository subversion;
|
++ stdenv.lib.optional enableSubversionRepository subversion
|
||||||
|
++ stdenv.lib.optional enableMongoDatabase mongodb;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Automated deployment of mutable components and services for Disnix";
|
description = "Automated deployment of mutable components and services for Disnix";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user