Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates ... x-updates is supposed to merge after stdenv-updates, so let's test it Conflicts: pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer) pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)		2013-02-21 12:43:00 +01:00
..
2.x.nix	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
3.2.x.nix	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00