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/services/networking | |
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/services/networking')
-rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 1d5682f5f3fb..ad6f9858aaf6 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -64,8 +64,8 @@ in { networking.networkmanager = { enable = mkOption { + type = types.bool; default = false; - merge = mergeEnableOption; description = '' Whether to use NetworkManager to obtain an IP address and other configuration for all network interfaces that are not manually @@ -76,11 +76,11 @@ in { }; packages = mkOption { + type = types.listOf types.path; default = [ ]; description = '' Extra packages that provide NetworkManager plugins. ''; - merge = mergeListOption; apply = list: [ networkmanager modemmanager wpa_supplicant ] ++ list; }; |