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
..
loader	Remove uses of mkFixStrictness	2013-10-28 22:45:55 +01:00
kernel.nix	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
kexec.nix	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
luksroot.nix	Add a way to define obsolete options that have no replacement	2013-10-23 20:08:22 +02:00
modprobe.nix	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
readonly-mountpoint.c	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
shutdown.nix	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
stage-1-init.sh	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
stage-1.nix	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
stage-2-init.sh	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
stage-2.nix	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
systemd-unit-options.nix	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
systemd.nix	Fix bogus mkOption types	2013-10-28 22:45:56 +01:00