Eelco Dolstra d5047faede Remove uses of the "merge" option attribute ... It's redundant because you can (and should) specify an option type, or an apply function.		2013-10-28 22:45:56 +01:00
..
config	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
hardware	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
installer
misc	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
profiles
programs
security	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
services	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
system	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
tasks	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
testing
virtualisation
module-list.nix
rename.nix