Vladimír Čunát 9b02635faa Merge recent master into x-updates ... Hydra: ?compare=1138350 Conflicts: nixos/modules/services/x11/desktop-managers/default.nix Two imports were added independently on the same line. I split it as well, as it was very long now.		2014-07-21 12:05:57 +02:00
..
audio	Merge recent master into x-updates	2014-07-17 19:30:56 +02:00
display-managers	freetype: major update, including some CVE security	2014-06-17 09:00:29 +02:00
editors	Add Light Table editor.	2014-07-17 12:25:22 +02:00
graphics	Merge recent master into x-updates	2014-07-21 12:05:57 +02:00
ike	ike: use stdenv.lib.licenses.sleepycat	2014-03-24 19:58:36 -05:00
inferno	Add inferno, a distributed cross-platform hosted OS	2014-07-02 14:00:49 +12:00
misc	Merge recent master into x-updates	2014-07-21 12:05:57 +02:00
networking	Merge recent master into x-updates	2014-07-17 19:30:56 +02:00
office	Add "please don't edit" comment at the top of every auto-generated Haskell file.	2014-07-14 13:21:41 +02:00
science	Re-generate Haskell packages with cabal2nix.	2014-07-14 17:33:52 +02:00
search
taxes	Add aangifte-2013	2014-03-01 16:54:16 +01:00
version-management	git: Update to 2.0.2	2014-07-20 23:49:45 +08:00
video	mpv: major update, incl. build fix with new ffmpeg	2014-07-21 10:05:50 +02:00
virtualization	qemu: 1.7.1 -> 2.0.0	2014-05-18 15:52:44 -05:00
window-managers	Merge recent master into x-updates	2014-07-17 19:30:56 +02:00