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/services/monitoring/smartd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nixos/modules/services/monitoring/smartd.nix')

diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index de07dc0dbaa..b0619a16175 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -20,8 +20,8 @@ let
         default = "";
         example = "-d sat";
         type = types.string;
-        merge = pkgs.lib.concatStringsSep " ";
-        description = "Options that determine how smartd monitors the device";
+        apply = pkgs.lib.concatStringsSep " ";
+        description = "Options that determine how smartd monitors the device.";
       };
     };
 
-- 
cgit 1.4.1