* Apache updated to 2.2.0.

* mod_python updated to 3.2.8, with a patch to get it to work with
  Apache 2.2.x.

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

pkgs/servers/http/apache-httpd/builder.sh

@@ -1,8 +1,14 @@
 buildInputs="$openssl $db4 $expat $perl"
 source $stdenv/setup
 
-configureFlags="--with-expat=$expat --enable-mods-shared=all --without-gdbm \
- --enable-threads --with-devrandom=/dev/urandom"
+configureFlags="\
+ --with-expat=$expat \
+ --with-z=$zlib \
+ --enable-mods-shared=all \
+ --enable-authn-alias \
+ --without-gdbm \
+ --enable-threads \
+ --with-devrandom=/dev/urandom"
 
 if test $db4Support; then
     configureFlags="--with-berkeley-db=$db4 $configureFlags"

pkgs/servers/http/apache-httpd/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, db4, expat, perl
+{ stdenv, fetchurl, openssl, db4, expat, perl, zlib
 , sslSupport, db4Support
 }:
 
@@ -7,17 +7,17 @@ assert db4Support -> db4 != null;
 assert expat != null && perl != null;
 
 stdenv.mkDerivation {
-  name = "apache-httpd-2.0.55";
+  name = "apache-httpd-2.2.0";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/httpd-2.0.55.tar.bz2;
-    md5 = "f1b5b65c8661db9ffe38b5a4a865a0e2";
+    url = http://archive.apache.org/dist/httpd/httpd-2.2.0.tar.bz2;
+    md5 = "402b90a2e47205f94b3b1d91e1a8c459";
   };
 
   inherit sslSupport db4Support;
 
-  inherit perl expat;
+  inherit perl expat zlib;
   openssl = if sslSupport then openssl else null;
   db4 = if db4Support then db4 else null;
 }