diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-16 15:02:26 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-16 15:02:26 +0000 |
| commit | e5027e5b365a91a7094ebae7875da6e6d31c211f (patch) | |
| tree | b45d1a912c85b66f6e9288145de64db5fa1e7b62 /pkgs/servers/http | |
| parent | ebdb515865ec152c77bc58f4f568aa39bb38cff0 (diff) | |
| parent | 82aab32119e54fbc0c1d2eae30af58ce4e30cf7b (diff) | |
| download | nixlib-e5027e5b365a91a7094ebae7875da6e6d31c211f.tar nixlib-e5027e5b365a91a7094ebae7875da6e6d31c211f.tar.gz nixlib-e5027e5b365a91a7094ebae7875da6e6d31c211f.tar.bz2 nixlib-e5027e5b365a91a7094ebae7875da6e6d31c211f.tar.lz nixlib-e5027e5b365a91a7094ebae7875da6e6d31c211f.tar.xz nixlib-e5027e5b365a91a7094ebae7875da6e6d31c211f.tar.zst nixlib-e5027e5b365a91a7094ebae7875da6e6d31c211f.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix index 0d586b0c3a62..1f5e1ae69bce 100644 --- a/pkgs/servers/http/apache-httpd/default.nix +++ b/pkgs/servers/http/apache-httpd/default.nix @@ -8,12 +8,12 @@ assert sslSupport -> openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; stdenv.mkDerivation rec { - version = "2.2.21"; + version = "2.2.22"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "c02f9b05da9a7e316ff37d9053dc76a57ba51cb4"; + sha1 = "766cd0843050a8dfb781e48b976f3ba6ebcf8696"; }; buildInputs = [perl apr aprutil pcre] ++ |