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	nixos-generate-config: Don't suggest setting fileSystems in configuration.nix	2013-10-24 05:28:37 +02:00
misc	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
profiles
programs	Fix an assertion set in the wrong place	2013-10-25 15:47:30 +02:00
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	nixos/libvirtd: fix remote ssh managment by adding netcat-openbsd in system packages	2013-10-24 11:01:43 +03:00
module-list.nix	services.redshift: New service	2013-10-22 09:03:06 +01:00
rename.nix	rename.nix: Don't use the extraConfigs feature	2013-10-28 22:45:55 +01:00