* Subversion 1.4.0. Note: Subversion 1.4 upgrades your working

copies, so it's hard to go back to 1.3.

svn path=/nixpkgs/trunk/; revision=6486

pkgs/development/libraries/apr-util/default.nix

@@ -1,10 +1,10 @@
 { stdenv, fetchurl, apr, expat
-, bdbSupport ? false, bdb ? null
+, bdbSupport ? false, db4 ? null
 }:
 
-assert bdbSupport -> bdb != null;
+assert bdbSupport -> db4 != null;
 
-stdenv.mkDerivation {
+(stdenv.mkDerivation {
   name = "apr-util-1.2.7";
   src = fetchurl {
     url = http://archive.apache.org/dist/apr/apr-util-1.2.7.tar.bz2;
@@ -12,6 +12,6 @@ stdenv.mkDerivation {
   };
   configureFlags = "
     --with-apr=${apr} --with-expat=${expat}
-    ${if bdbSupport then "--with-berkeley-db=${bdb}" else ""}
+    ${if bdbSupport then "--with-berkeley-db=${db4}" else ""}
   ";
-}
+}) // {inherit bdbSupport;}

pkgs/development/libraries/neon/default.nix

@@ -1,12 +1,24 @@
-{stdenv, fetchurl, libxml2}:
+{ stdenv, fetchurl, libxml2
+, compressionSupport ? true, zlib ? null
+, sslSupport ? true, openssl ? null
+}:
 
-stdenv.mkDerivation {
+assert compressionSupport -> zlib != null;
+assert sslSupport -> openssl != null;
+
+(stdenv.mkDerivation {
   name = "neon-0.25.5";
+  
   src = fetchurl {
     url = http://www.webdav.org/neon/neon-0.25.5.tar.gz;
     md5 = "b5fdb71dd407f0a3de0f267d27c9ab17";
   };
-  buildInputs = [libxml2];
+  
+  buildInputs = [libxml2] ++ (if compressionSupport then [zlib] else []);
 
-  configureFlags="--enable-shared";
-}
+  configureFlags="
+    --enable-shared --disable-static
+    ${if compressionSupport then "--with-zlib" else "--without-zlib"}
+    ${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"}
+  ";
+}) // {inherit compressionSupport sslSupport;}