Parnell Springmeyer 264db4e309 Set merge + mkIf always surprises me		2017-01-29 17:10:32 -06:00
..
config	Merging with upstream	2017-01-29 05:54:01 -06:00
hardware	Merge pull request #21995 from abbradar/opencl	2017-01-20 12:09:17 +03:00
i18n/input-method	nixos/ibus: fix custom panel example	2017-01-24 12:52:39 -06:00
installer	Merging with upstream	2017-01-29 05:54:01 -06:00
misc	Switching locate over to new wrapper API	2017-01-29 11:27:08 -06:00
profiles	install-device: correct command to start sshd	2017-01-25 21:09:31 +01:00
programs	Set merge + mkIf always surprises me	2017-01-29 17:10:32 -06:00
security	Set merge + mkIf always surprises me	2017-01-29 17:10:32 -06:00
services	Merging with upstream	2017-01-29 05:54:01 -06:00
system	Getting rid of the var indirection and using a bin path instead	2017-01-29 04:11:01 -06:00
tasks	Beebooboop	2017-01-29 05:39:18 -06:00
testing	virtualisation.qemu.program: Remove	2016-12-20 10:52:46 +01:00
virtualisation	Getting rid of the var indirection and using a bin path instead	2017-01-29 04:11:01 -06:00
module-list.nix	Merging with upstream	2017-01-29 05:54:01 -06:00
rename.nix	Merging with upstream	2017-01-29 05:54:01 -06:00