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.
---
 lib/types.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib/types.nix')

diff --git a/lib/types.nix b/lib/types.nix
index 07a6cc69fdca..3c21e34879cf 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -71,6 +71,12 @@ rec {
       merge = lib.concatStringsSep "\n";
     };
 
+    commas = mkOptionType {
+      name = "string";
+      check = builtins.isString;
+      merge = lib.concatStringsSep ",";
+    };
+
     envVar = mkOptionType {
       name = "environment variable";
       inherit (string) check;
-- 
cgit v1.2.3