diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-05 11:41:49 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-02-05 11:41:49 +0000 |
| commit | cb0c387ce2cfb163c91a6d5a2713aebb7cfd92d6 (patch) | |
| tree | a5f27415684cc5b2f3cfdd0f35adeae36c45270b /pkgs/development/libraries | |
| parent | 937f8663ac003c228062970a03d425abc506a27e (diff) | |
| download | nixpkgs-cb0c387ce2cfb163c91a6d5a2713aebb7cfd92d6.tar nixpkgs-cb0c387ce2cfb163c91a6d5a2713aebb7cfd92d6.tar.gz nixpkgs-cb0c387ce2cfb163c91a6d5a2713aebb7cfd92d6.tar.bz2 nixpkgs-cb0c387ce2cfb163c91a6d5a2713aebb7cfd92d6.tar.lz nixpkgs-cb0c387ce2cfb163c91a6d5a2713aebb7cfd92d6.tar.xz nixpkgs-cb0c387ce2cfb163c91a6d5a2713aebb7cfd92d6.tar.zst nixpkgs-cb0c387ce2cfb163c91a6d5a2713aebb7cfd92d6.zip | |
* Updated Apache-related packages.
svn path=/nixpkgs/trunk/; revision=10502
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/apr-util/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/development/libraries/apr/default.nix | 12 |
2 files changed, 28 insertions, 10 deletions
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 7f2ce3e3882..967408e0cb4 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -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"; + }; +} + diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index a42699063c5..ceae8a1d12a 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -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"; }; } |