nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-18 19:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

apache: merge updates from master branch

Browse Source 
These updates fix the issues earlier versions of Apache had with the recent
release of PCRE.
This commit is contained in:
Peter Simons 2012-11-21 16:09:08 +01:00
parent 592e4abe2b
commit 473ba2212d
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/http/apache-httpd/2.2.nix
View File

@ -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] ++

10
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -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 = ''