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
..
cups	cups: Don't build on Darwin	2013-01-29 12:43:53 +01:00
drivers	hplip: make pyqt4 dependency conditional on qtSupport	2013-02-08 00:27:07 +01:00
emulators	add winetricks, modified by vcunat@gmail.com	2013-02-10 16:20:24 +01:00
foldingathome
freestyle
ghostscript	ghostscript: fix infinite recursion in meta (sorry for that)	2013-01-31 13:21:21 +01:00
gxemul
jackaudio	jackaudio/default.nix: Update to 1.9.9.5.	2013-02-03 20:22:43 +04:00
lilypond
maven
my-env	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
screensavers
source-and-tags	Remove unnecessary parentheses around if conditions	2012-12-28 19:54:15 +01:00
themes/gtk2/oxygen-gtk
uboot	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
xosd
misc.nix