Author: sandervanderburg
Date: Wed Dec 22 13:31:25 2010
New Revision: 25234
URL: https://svn.nixos.org/websvn/nix/?rev=25234&sc=1
Log:
Bumped activation scripts so that postgresql and subversion types are supported
Modified:
nixpkgs/trunk/pkgs/tools/package-management/disnix/activation-scripts/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/trunk/pkgs/tools/package-management/disnix/activation-scripts/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/tools/package-management/disnix/activation-scripts/default.nix
Wed Dec 22 10:47:12 2010 (r25233)
+++
nixpkgs/trunk/pkgs/tools/package-management/disnix/activation-scripts/default.nix
Wed Dec 22 13:31:25 2010 (r25234)
@@ -1,21 +1,25 @@
{ stdenv, fetchurl
-, ejabberd ? null, mysql ? null
+, 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.2pre24557";
+ name = "disnix-activation-scripts-0.2pre25210";
src = fetchurl {
- url =
http://hydra.nixos.org/build/774785/download/1/disnix-activation-scripts-0.2pre24557.tar.gz;
- sha256 = "16allbni0hwcj9qyg67n4ly4bl09wp32rrds3s1hvq6a2p3a3fg7";
+ url =
http://hydra.nixos.org/build/816489/download/1/disnix-activation-scripts-0.2pre25210.tar.gz;
+ sha256 = "1jski4fjz4pmh0knh3rgfkkmc7i2krs164nh0fasbh2radksm0hl";
};
preConfigure = if enableEjabberdDump then "export
PATH=$PATH:${ejabberd}/sbin" else "";
@@ -25,10 +29,14 @@
${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 enableMySQLDatabase mysql
+ ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
+ ++ stdenv.lib.optional enableSubversionRepository subversion;
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Dec 22 10:47:12
2010 (r25233)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Dec 22 13:31:25
2010 (r25234)
@@ -7253,6 +7253,8 @@
enableAxis2WebService = getConfig ["disnix" "enableAxis2WebService"] false;
enableEjabberdDump = getConfig ["disnix" "enableEjabberdDump"] false;
enableMySQLDatabase = getConfig ["disnix" "enableMySQLDatabase"] false;
+ enablePostgreSQLDatabase = getConfig ["disnix" "enablePostgreSQLDatabase"]
false;
+ enableSubversionRepository = getConfig ["disnix"
"enableSubversionRepository"] false;
enableTomcatWebApplication = getConfig ["disnix"
"enableTomcatWebApplication"] false;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
