diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-11 23:48:08 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-11 23:48:08 +0100 |
| commit | f33fa1b66bbf181503e87a957e05c841093f2f8d (patch) | |
| tree | 8cbe0596681358965ebea30c2320dc3f53297827 /pkgs/servers/http | |
| parent | 5cf4905f3bec4c787820fae7a050c52be886c00a (diff) | |
| parent | ea49ac04966380be9bc77c62c0d01862b515e6a6 (diff) | |
| download | nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.gz nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.bz2 nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.lz nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.xz nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.zst nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/development/libraries/boost/generic.nix
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.2.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/winstone/default.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index eb9c6846089c..2af7b761c24a 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { ${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""} ${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""} --with-mpm=${mpm} + --enable-cache + --enable-disk-cache + --enable-file-cache + --enable-mem-cache ''; enableParallelBuilding = true; diff --git a/pkgs/servers/http/winstone/default.nix b/pkgs/servers/http/winstone/default.nix index 8991a220a76d..6a92c0a228af 100644 --- a/pkgs/servers/http/winstone/default.nix +++ b/pkgs/servers/http/winstone/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://winstone.sourceforge.net/"; - description = "A simple Java Servlet container."; + homepage = http://winstone.sourceforge.net/; + description = "A simple Java Servlet container"; license = stdenv.lib.licenses.cddl; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.rickynils ]; |