public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into multiple-outputs

Browse Source 
Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libsndfile/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Eelco Dolstra
2013-08-21 17:05:30 +02:00
parent 9555f3ba06 77b9f28658
commit 10cb4a8cf2
1087 changed files with 30296 additions and 32019 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/apr-util/default.nix
+2 -2
View File
@@ -9,11 +9,11 @@ assert bdbSupport -> db4 != null;
assert ldapSupport -> openldap != null;
stdenv.mkDerivation rec {
name = "apr-util-1.5.1";
name = "apr-util-1.5.2";
src = fetchurl {
url = "mirror://apache/apr/${name}.tar.bz2";
md5 = "9c1db8606e520f201c451ec9a0b095f6";
md5 = "89c1348aa79e898d7c34a6206311c9c2";
};
configureFlags = ''