summaryrefslogtreecommitdiffstats
path: root/pkgs/development/libraries/apr-util
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-09 10:57:57 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-09 10:57:57 +0200
commit811de3bfaabc39a7a7d22ba34053cfb1a2c4e219 (patch)
tree631d4305b76e948baefb54741fe2ea3c4dd9fe8b /pkgs/development/libraries/apr-util
parentc34932ef86628b8b30284882d8baaef4c56320dd (diff)
parenta2c7804903cdd41d1905fa954bd2dba5e165e793 (diff)
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts: pkgs/tools/security/gnupg/default.nix
Diffstat (limited to 'pkgs/development/libraries/apr-util')
-rw-r--r--pkgs/development/libraries/apr-util/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 1dc4b1d77bae..76477d38b6d5 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -14,11 +14,11 @@ let
in
stdenv.mkDerivation rec {
- name = "apr-util-1.5.3";
+ name = "apr-util-1.5.4";
src = fetchurl {
url = "mirror://apache/apr/${name}.tar.bz2";
- sha256 = "0s1rpqjy5xr03k9s4xrsm5wvhj5286vlkf6jvqayw99yy5sb3vbq";
+ sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6";
};
configureFlags = ''
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://apr.apache.org/;
description = "A companion library to APR, the Apache Portable Runtime";
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}