Shea Levy 139f8949e6 Merge branch 'merge-kernel-builds' into upstream-master ... This is a second attempt at unifying the generic and manual-config kernel builds (see #412 for the last time). The set of working kernel packages is a superset of those that work on master, and as the only objection last time was the size of the $dev closure and now both $out and $dev combined are 20M smaller than $out on master (see message for ac2035287f), this should be unobjectionable. Signed-off-by: Shea Levy <shea@shealevy.com>		2014-01-05 07:13:19 -05:00
..
applications	Merge branch 'merge-kernel-builds' into upstream-master	2014-01-05 07:13:19 -05:00
build-support	Update FLTK and TigerVNC; doesn't fix TigerVNC Xvnc build per se	2014-01-01 01:36:57 +04:00
data	Whitespace fixes in package expressions I maintain	2014-01-02 17:58:08 +01:00
desktops	Remove uses of __overrides feature	2013-12-30 11:04:45 -05:00
development	Merge branch 'merge-kernel-builds' into upstream-master	2014-01-05 07:13:19 -05:00
games	Merge pull request #1441 from rszibele/xonotic	2014-01-02 07:50:35 -08:00
misc	Update Wine	2014-01-04 14:55:42 +04:00
os-specific	Merge branch 'merge-kernel-builds' into upstream-master	2014-01-05 07:13:19 -05:00
servers	Merge branch 'merge-kernel-builds' into upstream-master	2014-01-05 07:13:19 -05:00
shells	dash: enable Hydra builds on Linux	2013-12-21 00:05:38 +01:00
stdenv
test
tools	youtubeDL: update from 2013.12.20 to 2014.01.03	2014-01-05 08:15:21 +02:00
top-level	Merge branch 'merge-kernel-builds' into upstream-master	2014-01-05 07:13:19 -05:00