diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 16:14:15 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:56 +0100 |
| commit | d5047faedef254d01a21618224698c190bb67e5b (patch) | |
| tree | 42a43de15611b5e35b2888f02fb940365edb1402 /nixos/modules/tasks | |
| parent | f4a418761b481b15900c78b8086e7be58b0afe4e (diff) | |
| download | nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.gz nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.bz2 nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.lz nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.xz nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.zst nixlib-d5047faedef254d01a21618224698c190bb67e5b.zip | |
Remove uses of the "merge" option attribute
It's redundant because you can (and should) specify an option type, or an apply function.
Diffstat (limited to 'nixos/modules/tasks')
| -rw-r--r-- | nixos/modules/tasks/filesystems.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/tasks/network-interfaces.nix | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 6e3d019ea939..2b4fe582c372 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -43,8 +43,7 @@ let options = mkOption { default = "defaults,relatime"; example = "data=journal"; - type = types.string; - merge = pkgs.lib.concatStringsSep ","; + type = types.commas; description = "Options used to mount the file system."; }; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 0177d6396dfa..0767c3db1fec 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -220,8 +220,8 @@ in }; networking.useDHCP = mkOption { + type = types.bool; default = true; - merge = mergeEnableOption; description = '' Whether to use DHCP to obtain an IP address and other configuration for all network interfaces that are not manually |