* Updated Apache-related packages.
svn path=/nixpkgs/trunk/; revision=10502
This commit is contained in:
@@ -4,14 +4,26 @@
|
||||
|
||||
assert bdbSupport -> db4 != null;
|
||||
|
||||
(stdenv.mkDerivation {
|
||||
name = "apr-util-1.2.7";
|
||||
stdenv.mkDerivation {
|
||||
name = "apr-util-1.2.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://archive.apache.org/dist/apr/apr-util-1.2.7.tar.bz2;
|
||||
md5 = "a4c527f08ae2298e62a88472291bf066";
|
||||
url = http://archive.apache.org/dist/apr/apr-util-1.2.12.tar.bz2;
|
||||
sha256 = "152xwaxikp22acz7ypqsvlyjxhak6p40805wwbw7hcg1gyg2scyl";
|
||||
};
|
||||
configureFlags = "
|
||||
|
||||
configureFlags = ''
|
||||
--with-apr=${apr} --with-expat=${expat}
|
||||
${if bdbSupport then "--with-berkeley-db=${db4}" else ""}
|
||||
";
|
||||
}) // {inherit bdbSupport;}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit bdbSupport;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = http://apr.apache.org/;
|
||||
description = "A companion library to APR, the Apache Portable Runtime";
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,15 @@
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "apr-1.2.7";
|
||||
name = "apr-1.2.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://archive.apache.org/dist/apr/apr-1.2.7.tar.bz2;
|
||||
md5 = "e77887dbafc515c63feac84686bcb3bc";
|
||||
url = http://archive.apache.org/dist/apr/apr-1.2.12.tar.bz2;
|
||||
sha256 = "0d11wa2hlhb5lnny5rcazca056b35kgccx94cd38bazw1d6b68nv";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = http://apr.apache.org/;
|
||||
description = "The Apache Portable Runtime library";
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user