52 Commits

Author	SHA1	Message	Date
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
Vladimír Čunát	6331d32267	rename the expressions of some gtk-related libraries ... now the default (and usually only) version is called default	2013-01-29 16:48:23 +01:00