Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat ... See #490 discussion. This reverts commit 1278859d31, reversing changes made to 0c020c98f9. Conflicts: pkgs/desktops/xfce/core/xfce4-session.nix (take master) pkgs/lib/misc.nix (auto)		2013-05-09 14:03:35 +02:00
..
cups	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
drivers	hplip: make pyqt4 dependency conditional on qtSupport	2013-02-08 00:27:07 +01:00
emulators	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
foldingathome
freestyle
ghostscript	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
gxemul
jackaudio	jackaudio/default.nix: Update to 1.9.9.5.	2013-02-03 20:22:43 +04:00
lilypond
maven
my-env	Add cleanupCmds option to pkgs.myEnvFun	2013-04-13 19:10:50 +02:00
screensavers
source-and-tags	Remove unnecessary parentheses around if conditions	2012-12-28 19:54:15 +01:00
themes/gtk2/oxygen-gtk	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
uboot	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
xosd
misc.nix	add versionedDerivation	2013-05-08 15:43:07 +03:00