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/acl/default.nix
	pkgs/development/libraries/atk/2.6.x.nix
	pkgs/development/libraries/attr/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/2.34.x.nix
	pkgs/development/libraries/gtk+/2.24.x.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/openssl/default.nix
	pkgs/development/libraries/pango/1.30.x.nix
	pkgs/misc/cups/default.nix
	pkgs/os-specific/linux/util-linux/default.nix
	pkgs/servers/x11/xorg/builder.sh
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Eelco Dolstra
2013-06-09 00:41:27 +02:00
parent 61129e1ee9 8c4a613f3a
commit 99b88cfb53
3321 changed files with 87541 additions and 48046 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/atk/2.2.x.nix → pkgs/development/libraries/atk/2.6.x.nix
+4 -4
View File
@@ -1,18 +1,18 @@
{ stdenv, fetchurl, pkgconfig, perl, glib }:
stdenv.mkDerivation rec {
name = "atk-2.2.0";
name = "atk-2.6.0";
src = fetchurl {
url = mirror://gnome/sources/atk/2.2/atk-2.2.0.tar.xz;
sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb";
url = "mirror://gnome/sources/atk/2.6/${name}.tar.xz";
sha256 = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f";
};
enableParallelBuilding = true;
outputs = [ "dev" "out" "doc" ];
buildNativeInputs = [ pkgconfig perl ];
nativeBuildInputs = [ pkgconfig perl ];
propagatedBuildInputs = [ glib ];