summaryrefslogtreecommitdiffstats
path: root/lib/types.nix
diff options
context:
space:
mode:
Diffstat (limited to 'lib/types.nix')
-rw-r--r--lib/types.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/types.nix b/lib/types.nix
index b225119299da..e22bcd326c86 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -111,7 +111,7 @@ rec {
name = "int";
description = "signed integer";
check = isInt;
- merge = mergeOneOption;
+ merge = mergeEqualOption;
};
# Specialized subdomains of int
@@ -176,14 +176,14 @@ rec {
name = "float";
description = "floating point number";
check = isFloat;
- merge = mergeOneOption;
+ merge = mergeEqualOption;
};
str = mkOptionType {
name = "str";
description = "string";
check = isString;
- merge = mergeOneOption;
+ merge = mergeEqualOption;
};
strMatching = pattern: mkOptionType {
@@ -243,7 +243,7 @@ rec {
name = "path";
# Hacky: there is no ‘isPath’ primop.
check = x: builtins.substring 0 1 (toString x) == "/";
- merge = mergeOneOption;
+ merge = mergeEqualOption;
};
# drop this in the future:
@@ -415,7 +415,7 @@ rec {
name = "enum";
description = "one of ${concatMapStringsSep ", " show values}";
check = flip elem values;
- merge = mergeOneOption;
+ merge = mergeEqualOption;
functor = (defaultFunctor name) // { payload = values; binOp = a: b: unique (a ++ b); };
};