Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size ... Many non-conflict problems weren't (fully) resolved in this commit yet.		2015-10-03 13:33:37 +02:00
..
config	Merge commit staging+systemd into closure-size	2015-10-03 13:33:37 +02:00
hardware	Put all firmware in $out/lib/firmware	2015-08-25 00:40:34 +02:00
installer	Merge pull request #10160 from dezgeg/pr-unset-build-hook-in-nixos-install	2015-09-30 23:33:07 +02:00
misc	xtreemfs: add nixos module	2015-09-22 21:46:52 +02:00
profiles	Merge commit staging+systemd into closure-size	2015-10-03 13:33:37 +02:00
programs	Manual: Remove store path references	2015-09-24 11:50:58 +02:00
security	Merge commit staging+systemd into closure-size	2015-10-03 13:33:37 +02:00
services	Merge commit staging+systemd into closure-size	2015-10-03 13:33:37 +02:00
system	Merge commit staging+systemd into closure-size	2015-10-03 13:33:37 +02:00
tasks	Merge commit staging+systemd into closure-size	2015-10-03 13:33:37 +02:00
testing
virtualisation	Blacklist the xen_fbfront kernel module	2015-09-28 22:15:47 +02:00
module-list.nix	xtreemfs: add nixos module	2015-09-22 21:46:52 +02:00
rename.nix	nixos: give users of 'services.openvpn.enable' a nice warning message	2015-09-10 11:38:43 +02:00