diff options
| author | Peter Simons <simons@cryp.to> | 2012-11-21 16:09:08 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-11-21 16:09:08 +0100 |
| commit | 473ba2212d3b8cc16b5ffb2f5a6367425614357c (patch) | |
| tree | c906efed82afd8dcc292e2685b70ceb62562d276 | |
| parent | 592e4abe2b3a0243ebf247539928734c2f869f29 (diff) | |
| download | nixlib-473ba2212d3b8cc16b5ffb2f5a6367425614357c.tar nixlib-473ba2212d3b8cc16b5ffb2f5a6367425614357c.tar.gz nixlib-473ba2212d3b8cc16b5ffb2f5a6367425614357c.tar.bz2 nixlib-473ba2212d3b8cc16b5ffb2f5a6367425614357c.tar.lz nixlib-473ba2212d3b8cc16b5ffb2f5a6367425614357c.tar.xz nixlib-473ba2212d3b8cc16b5ffb2f5a6367425614357c.tar.zst nixlib-473ba2212d3b8cc16b5ffb2f5a6367425614357c.zip | |
apache: merge updates from master branch
These updates fix the issues earlier versions of Apache had with the recent release of PCRE.
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.2.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index f2a21ee28be2..d4def35c09f1 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert mpm == "prefork" || mpm == "worker" || mpm == "event"; stdenv.mkDerivation rec { - version = "2.2.22"; + version = "2.2.23"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "766cd0843050a8dfb781e48b976f3ba6ebcf8696"; + sha1 = "2776145201068045d4ed83157a0e2e1c28c4c453"; }; buildInputs = [perl apr aprutil pcre] ++ diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index c9161bf59093..507ced85998a 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -14,17 +14,17 @@ assert sslSupport -> aprutil.sslSupport && openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; stdenv.mkDerivation rec { - version = "2.4.2"; + version = "2.4.3"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2"; + sha256 = "17i4zdcjfvxks0p1fbqvab37kr8d6zscqaqan8pqkw8iq6wh48fq"; }; buildInputs = [perl] ++ optional ldapSupport openldap ++ # there is no --with-ldap flag - optional libxml2Support libxml2; # there is --with-libxml2, but it doesn't work + optional libxml2Support libxml2; # Required for ‘pthread_cancel’. NIX_LDFLAGS = "-lgcc_s"; @@ -38,9 +38,13 @@ stdenv.mkDerivation rec { --disable-debugger-mode --enable-mods-shared=all --enable-mpms-shared=all + --enable-cern-meta + --enable-imagemap + --enable-cgi ${optionalString proxySupport "--enable-proxy"} ${optionalString sslSupport "--enable-ssl --with-ssl=${openssl}"} ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} + ${optionalString libxml2Support "--with-libxml2=${libxml2}/include/libxml2"} ''; postInstall = '' |