Merging from trunk. I resolved some conflicts; I hope that well.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
parent 4309788df0 327a2eae30
commit 6dc839d344
221 changed files with 3452 additions and 1129 deletions
@@ -41,9 +41,10 @@ stdenv.mkDerivation rec {
  passthru = {
    inherit apr aprutil sslSupport proxySupport;
  };
-  
+
  meta = {
    description = "Apache HTTPD, the world's most popular web server";
    homepage = http://httpd.apache.org/;
+    license = "ASL2.0";
  };
 }