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

..

cacert

cacert: Update to 20120628

2012-07-05 17:31:23 -04:00

gsettings-desktop-schemas

Rename buildNativeInputs -> nativeBuildInputs

2012-12-28 19:20:09 +01:00

hicolor-icon-theme

Add some packages to the channel

2012-08-17 09:53:55 -04:00

iana-etc

* Updated the IANA /etc info.

2009-05-28 12:42:41 +00:00

miscfiles

Adding bsdgames and miscfiles (this later, for 'words')

2009-10-26 23:03:36 +00:00

mobile-broadband-provider-info

mobile-broadband-provider-info: Update to 20120614

2012-07-31 15:16:11 +02:00

poppler-data

minor poppler-data update

2013-01-29 14:07:30 +01:00

shared-desktop-ontologies

SDO-0.10.0

2012-08-26 22:23:17 +04:00

shared-mime-info

shared-mime-info-1.0

2012-03-31 21:29:12 +00:00

tzdata

Add tzdata

2012-09-18 14:00:18 -04:00

xkeyboard-config

Rename buildNativeInputs -> nativeBuildInputs

2012-12-28 19:20:09 +01:00