Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/top-level/all-packages.nix		2013-11-01 08:31:54 +01:00
..
cups	upgrade some packages to libusb1	2013-07-01 07:52:13 +02:00
drivers
emulators	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00
foldingathome
freestyle
ghostscript	ghostscript: Revert to 9.06	2013-09-26 18:03:43 +02:00
gxemul
jackaudio
lilypond	lilypond: add missing ghostscript path to wrapper	2013-09-28 21:07:48 +02:00
maven
my-env	my-env: pull --norc shell flag out into shell parameter	2013-10-21 20:58:40 +03:00
screensavers	More description fixes	2013-10-06 12:01:38 +02:00
solfege	solfege: new package	2013-06-06 19:30:41 +02:00
source-and-tags
themes	add mate-themes 1.6.1	2013-08-27 17:00:03 +02:00
uboot
vim-plugins	vimPlugins.ipython: add expression	2013-10-29 15:45:46 +02:00
xosd
misc.nix	add versionedDerivation	2013-05-08 15:43:07 +03:00