* Latest httpd, apr, apr-util.

svn path=/nixpkgs/trunk/; revision=16615
This commit is contained in:
Eelco Dolstra 2009-08-07 15:26:13 +00:00
parent 7049420fba
commit 223bce6491
3 changed files with 13 additions and 19 deletions

View File

@ -4,12 +4,12 @@
assert bdbSupport -> db4 != null; assert bdbSupport -> db4 != null;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "apr-util-1.3.4"; name = "apr-util-1.3.9";
src = fetchurl { src = fetchurl {
url = mirror://apache/apr/apr-util-1.3.4.tar.bz2; url = "mirror://apache/apr/${name}.tar.bz2";
sha256 = "1kin1yh42sk7hw81x3aynjf2g0k07n6707426c2mi6fh6lr0lys4"; sha256 = "10zcy1an5xkjx8nflirvm2a8rnp9psckws6r7xr5wq6ffxnafhc7";
}; };
configureFlags = '' configureFlags = ''

View File

@ -1,20 +1,13 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "apr-1.3.3"; name = "apr-1.3.8";
src = fetchurl { src = fetchurl {
url = mirror://apache/apr/apr-1.3.3.tar.bz2; url = "mirror://apache/apr/${name}.tar.bz2";
sha256 = "0dyxw3km88f0li1d39vyr09670yb12xn8j1h8dq331kc6rw3npyr"; sha256 = "0mzsr6pv2gcp1cvppfzsd2c7zqgbw0rakjndcna49gv1dq0zgdvx";
}; };
# For now, disable detection of epoll to ensure that Apache still
# runs on Linux 2.4 kernels. Once we've dropped support for 2.4 in
# Nixpkgs, this can go. In general, it's a problem that APR
# detects characteristics of the build system's kernel to decide
# what to use at runtime, since it's impure.
#apr_cv_epoll = "no";
meta = { meta = {
homepage = http://apr.apache.org/; homepage = http://apr.apache.org/;
description = "The Apache Portable Runtime library"; description = "The Apache Portable Runtime library";

View File

@ -5,12 +5,13 @@
assert sslSupport -> openssl != null; assert sslSupport -> openssl != null;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "apache-httpd-2.2.11"; version = "2.2.12";
name = "apache-httpd-${version}";
src = fetchurl { src = fetchurl {
url = mirror://apache/httpd/httpd-2.2.11.tar.bz2; url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
md5 = "3e98bcb14a7122c274d62419566431bb"; md5 = "7d30c7195883c26a6eaf59a85b42c6ef";
}; };
#inherit sslSupport; #inherit sslSupport;