Vladimír Čunát 87c3c0e885 Merge master into #2129 ... Conflicts (easy, just UID shifted): nixos/modules/misc/ids.nix nixos/modules/module-list.nix		2014-08-12 19:24:08 +02:00
..
admin	sec: update to version 2.7.6	2014-07-30 16:11:52 +02:00
archivers	Update ZPAQ	2014-08-03 22:29:41 +04:00
audio
backup	obnam: Update from 1.6.1 to 1.8	2014-08-12 13:32:24 +02:00
bluetooth	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
cd-dvd	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
compression	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
filesystems	Merge remote-tracking branch 'origin/master' into staging.	2014-08-08 09:51:01 +02:00
graphics	gnuplot: Use default compiler on Darwin	2014-08-09 19:53:09 +02:00
inputmethods/fcitx	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
misc	Add the bspwm window manager to Nix.	2014-08-12 18:22:15 +02:00
networking	isync: Bump to 1.1.1	2014-08-12 13:34:37 +02:00
package-management	Fixed deterministicness of fetchgit with leaveDotGit	2014-08-10 16:25:29 +02:00
security	Merge master into #2129	2014-08-12 19:24:08 +02:00
system	Merge pull request #3525 from wkennington/cache.ddrescue	2014-08-11 22:40:42 +02:00
text	Merge remote-tracking branch 'origin/master' into staging.	2014-08-08 09:51:01 +02:00
typesetting	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
video	Mark a bunch of packages as broken or not supported on Darwin	2014-08-08 17:59:02 +02:00
virtualization	ec2-ami-tools: Update from 1.4.0.9 to 1.5.3	2014-08-05 01:25:16 +02:00
X11	Mark a bunch of packages as broken or not supported on Darwin	2014-08-08 17:59:02 +02:00