public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bumped activation scripts so that postgresql and subversion types are supported

Browse Source 
svn path=/nixpkgs/trunk/; revision=25234
This commit is contained in:
Sander van der Burg 2010-12-22 13:31:25 +00:00
parent 286e4c75fd
commit 80af0654fb
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,21 +1,25 @@
{ stdenv, fetchurl { stdenv, fetchurl
, ejabberd ? null, mysql ? null , ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null
, enableApacheWebApplication ? false , enableApacheWebApplication ? false
, enableAxis2WebService ? false , enableAxis2WebService ? false
, enableEjabberdDump ? false , enableEjabberdDump ? false
, enableMySQLDatabase ? false , enableMySQLDatabase ? false
, enablePostgreSQLDatabase ? false
, enableSubversionRepository ? false
, enableTomcatWebApplication ? false , enableTomcatWebApplication ? false
, catalinaBaseDir ? "/var/tomcat" , catalinaBaseDir ? "/var/tomcat"
}: }:
assert enableMySQLDatabase -> mysql != null; assert enableMySQLDatabase -> mysql != null;
assert enablePostgreSQLDatabase -> postgresql != null;
assert enableSubversionRepository -> subversion != null;
assert enableEjabberdDump -> ejabberd != null; assert enableEjabberdDump -> ejabberd != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "disnix-activation-scripts-0.2pre24557"; name = "disnix-activation-scripts-0.2pre25210";
src = fetchurl { src = fetchurl {
url = http://hydra.nixos.org/build/774785/download/1/disnix-activation-scripts-0.2pre24557.tar.gz; url = http://hydra.nixos.org/build/816489/download/1/disnix-activation-scripts-0.2pre25210.tar.gz;
sha256 = "16allbni0hwcj9qyg67n4ly4bl09wp32rrds3s1hvq6a2p3a3fg7"; sha256 = "1jski4fjz4pmh0knh3rgfkkmc7i2krs164nh0fasbh2radksm0hl";
}; };
preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
@ -25,10 +29,14 @@ stdenv.mkDerivation {
${if enableAxis2WebService then "--with-axis2" else "--without-axis2"} ${if enableAxis2WebService then "--with-axis2" else "--without-axis2"}
${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"} ${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"}
${if enableMySQLDatabase then "--with-mysql" else "--without-mysql"} ${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 enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"}
''; '';
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 enableSubversionRepository subversion;
} }

2
pkgs/top-level/all-packages.nix
View File

@ -7253,6 +7253,8 @@ let
enableAxis2WebService = getConfig ["disnix" "enableAxis2WebService"] false; enableAxis2WebService = getConfig ["disnix" "enableAxis2WebService"] false;
enableEjabberdDump = getConfig ["disnix" "enableEjabberdDump"] false; enableEjabberdDump = getConfig ["disnix" "enableEjabberdDump"] false;
enableMySQLDatabase = getConfig ["disnix" "enableMySQLDatabase"] false; enableMySQLDatabase = getConfig ["disnix" "enableMySQLDatabase"] false;
enablePostgreSQLDatabase = getConfig ["disnix" "enablePostgreSQLDatabase"] false;
enableSubversionRepository = getConfig ["disnix" "enableSubversionRepository"] false;
enableTomcatWebApplication = getConfig ["disnix" "enableTomcatWebApplication"] false; enableTomcatWebApplication = getConfig ["disnix" "enableTomcatWebApplication"] false;
}; };