* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25244

3 files changed, 19 insertions, 11 deletions

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index aebe7945352..94629861b58 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, iproute, lzo, openssl, nettools}:
 
 stdenv.mkDerivation rec {
-  name = "openvpn-2.1.1";
+  name = "openvpn-2.1.4";
 
   src = fetchurl {
-    url = "http://openvpn.net/release/${name}.tar.gz";
-    sha256 = "0hj8cdwgdxfsvjxnw4byys3ij719cg9bl9iadcchayzzymx0s653";
+    url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
+    sha256 = "1x9aymbk580zp35b7dhhkn29a4chhxnzrxjfmp948bgqvvjpizk7";
   };
 
   buildInputs = [ iproute lzo openssl ];
diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix
index c19c6a406a9..d1507e253a8 100644
--- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix
+++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix
@@ -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 @@ stdenv.mkDerivation {
 		     ${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;
 }
diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix
index 4f4cf91af1f..d4bec98dc54 100644
--- a/pkgs/tools/package-management/nix/sqlite.nix
+++ b/pkgs/tools/package-management/nix/sqlite.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre25121";
+  name = "nix-1.0pre25179";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/805927/download/4/${name}.tar.bz2";
-    sha256 = "94e619e8b44f1172e71dc86d0aec1a557e76d49609e9a1fccbcea752360e3e97";
+    url = "http://hydra.nixos.org/build/811883/download/4/${name}.tar.bz2";
+    sha256 = "4a6f7ca69428d24f253f8f199589d25fca1e7146a6591288392423634e3303f7";
   };
 
   buildInputs = [ perl curl openssl pkgconfig boehmgc ];