Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/development/interpreters/perl/5.16/default.nix pkgs/tools/networking/curl/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-python.nix pkgs/top-level/release-small.nix pkgs/top-level/release.nix		2013-12-04 18:33:52 +01:00
..
cups
drivers	gutenprint: wrap sbin/cups-genppd.5.2	2013-11-10 16:32:05 +01:00
emulators	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-12-04 18:33:52 +01: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	slock: update from 1.0 to 1.1	2013-12-04 06:23:35 +02:00
solfege	solfege: refactor meta attributes	2013-11-24 13:27:24 +01:00
source-and-tags
themes	add mate-themes 1.6.1	2013-08-27 17:00:03 +02:00
uboot	clean up git revision handling in several packages	2013-11-13 12:46:55 +02:00
vim-plugins	vimPlugins.ipython: add expression	2013-10-29 15:45:46 +02:00
xosd
misc.nix