mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 05:00:16 +00:00
* Latest httpd, apr, apr-util.
svn path=/nixpkgs/trunk/; revision=16615
This commit is contained in:
parent
7049420fba
commit
223bce6491
|
@ -4,12 +4,12 @@
|
|||
|
||||
assert bdbSupport -> db4 != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "apr-util-1.3.4";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "apr-util-1.3.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://apache/apr/apr-util-1.3.4.tar.bz2;
|
||||
sha256 = "1kin1yh42sk7hw81x3aynjf2g0k07n6707426c2mi6fh6lr0lys4";
|
||||
url = "mirror://apache/apr/${name}.tar.bz2";
|
||||
sha256 = "10zcy1an5xkjx8nflirvm2a8rnp9psckws6r7xr5wq6ffxnafhc7";
|
||||
};
|
||||
|
||||
configureFlags = ''
|
||||
|
|
|
@ -1,20 +1,13 @@
|
|||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "apr-1.3.3";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "apr-1.3.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://apache/apr/apr-1.3.3.tar.bz2;
|
||||
sha256 = "0dyxw3km88f0li1d39vyr09670yb12xn8j1h8dq331kc6rw3npyr";
|
||||
url = "mirror://apache/apr/${name}.tar.bz2";
|
||||
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 = {
|
||||
homepage = http://apr.apache.org/;
|
||||
description = "The Apache Portable Runtime library";
|
||||
|
|
|
@ -5,12 +5,13 @@
|
|||
|
||||
assert sslSupport -> openssl != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "apache-httpd-2.2.11";
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.2.12";
|
||||
name = "apache-httpd-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://apache/httpd/httpd-2.2.11.tar.bz2;
|
||||
md5 = "3e98bcb14a7122c274d62419566431bb";
|
||||
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
|
||||
md5 = "7d30c7195883c26a6eaf59a85b42c6ef";
|
||||
};
|
||||
|
||||
#inherit sslSupport;
|
||||
|
|
Loading…
Reference in a new issue