From 3d9df37b339cf2738eac63c9f7d7cde07738a1d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Oct 2005 19:44:17 +0000
Subject: [PATCH] * Apache updated to 2.0.55 (security fixes).  Also added to
 the   channel (finally!).

svn path=/nixpkgs/trunk/; revision=4093
---
 pkgs/servers/http/apache-httpd/default.nix | 6 +++---
 pkgs/system/populate-cache.nix             | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix
index 7e3280a4e87..ba0835d1a30 100644
--- a/pkgs/servers/http/apache-httpd/default.nix
+++ b/pkgs/servers/http/apache-httpd/default.nix
@@ -7,12 +7,12 @@ assert db4Support -> db4 != null;
 assert expat != null && perl != null;
 
 stdenv.mkDerivation {
-  name = "apache-httpd-2.0.54";
+  name = "apache-httpd-2.0.55";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://apache.cs.uu.nl/dist/httpd/httpd-2.0.54.tar.bz2;
-    md5 = "4ae8a38c6b5db9046616ce10a0d551a2";
+    url = http://apache.cs.uu.nl/dist/httpd/httpd-2.0.55.tar.bz2;
+    md5 = "f1b5b65c8661db9ffe38b5a4a865a0e2";
   };
 
   inherit sslSupport db4Support;
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index 1953095c1ce..a136eda2028 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -62,6 +62,7 @@ let {
     docbook_ng
     docbook_xml_xslt
     jing_tools
+    apacheHttpd
     subversion
     darcs
     pan