summaryrefslogtreecommitdiffstats
path: root/lib/types.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-28 16:14:15 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-28 22:45:56 +0100
commitd5047faedef254d01a21618224698c190bb67e5b (patch)
tree42a43de15611b5e35b2888f02fb940365edb1402 /lib/types.nix
parentf4a418761b481b15900c78b8086e7be58b0afe4e (diff)
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 'lib/types.nix')
-rw-r--r--lib/types.nix6
1 files changed, 6 insertions, 0 deletions
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;