Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/poppler/default.nix		2014-10-16 15:16:50 +02:00
..
audio	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
display-managers	Various SLIM themes, obtained from Sourceforge's SLIM website	2014-09-21 19:55:26 +01:00
editors	haskell-yi-custom: broken = true for now	2014-10-15 06:08:18 +01:00
gis	qgis: disable parallel building	2014-10-13 15:32:50 +02:00
graphics	change md5sum to sha256sum for a few packages	2014-10-12 16:13:21 +02:00
inferno	Add missing 's' in remaining meta.maintainer(s) attrs	2014-07-22 23:49:21 +02:00
misc	Merge pull request #4495 from NixOS/pythonFull_improvements	2014-10-16 13:24:18 +02:00
networking	firefox: use -O3 on 32bit linux to reduce memory usage on linker	2014-10-16 11:12:26 +02:00
office	tagainijisho: new derivation	2014-10-14 01:42:23 +01:00
science	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
search	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
taxes	Add aangifte-2013	2014-03-01 16:54:16 +01:00
version-management	git-annex: broken by update to 'persistent' and 'yesod'	2014-10-14 17:39:35 +02:00
video	miro: Add support for video/audio library sharing.	2014-10-14 19:46:59 +02:00
virtualization	virt-manager: fix missing schema error	2014-10-03 16:09:03 +02:00
window-managers	Merge pull request #4387 from 1126/refactor-stumpwm	2014-10-13 17:50:46 +04:00