Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates ... Conflicts (taken from @7c6f434c): pkgs/development/libraries/libgphoto2/default.nix		2013-06-08 15:41:39 +00:00
..
cups	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
drivers	hplip: make pyqt4 dependency conditional on qtSupport	2013-02-08 00:27:07 +01:00
emulators	Update Wine	2013-06-07 10:27:19 +04:00
foldingathome	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
freestyle	* Fix some more "args: with args".	2010-07-30 14:47:23 +00:00
ghostscript	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
gxemul	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
jackaudio	jackaudio/default.nix: Update to 1.9.9.5.	2013-02-03 20:22:43 +04:00
lilypond	lilypond: Update to 2.16.2, fix guile.	2013-05-18 13:35:14 +02:00
maven	Remove old maven versions, aliased maven to maven3. Updated maven 3 to 3.0.4	2012-08-25 19:43:54 +02:00
my-env	Fixing 'my-env', when without cleanup.	2013-05-14 18:59:50 +02:00
screensavers	Remove a bunch of unreferenced files	2012-11-29 13:43:37 +01:00
solfege	solfege: new package	2013-06-06 19:30:41 +02:00
source-and-tags	Remove unnecessary parentheses around if conditions	2012-12-28 19:54:15 +01:00
themes	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
uboot	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
xosd	* More cleanup.	2010-07-28 15:35:01 +00:00
misc.nix	add versionedDerivation	2013-05-08 15:43:07 +03:00