From d5047faedef254d01a21618224698c190bb67e5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Oct 2013 16:14:15 +0100
Subject: Remove uses of the "merge" option attribute

It's redundant because you can (and should) specify an option type, or
an apply function.
---
 nixos/modules/tasks/filesystems.nix        | 3 +--
 nixos/modules/tasks/network-interfaces.nix | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'nixos/modules/tasks')

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
-- 
cgit 1.4.1