diff options
author | danbst <abcz2.uprola@gmail.com> | 2019-07-25 18:12:15 +0300 |
---|---|---|
committer | danbst <abcz2.uprola@gmail.com> | 2019-07-25 18:12:15 +0300 |
commit | 795383204e2a63a41ca38c6ca021a97c7f5d1775 (patch) | |
tree | 5af64382fbed6acb59db3c39650178dc0888fb2e | |
parent | 2797ddee7ddebbb1292ea7673c42d77bc82b8515 (diff) |
lib/types: change merge strategy for `str`, `int`, `float` and `enum`
Change to `mergeEqualOption`.
-rw-r--r-- | lib/types.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/types.nix b/lib/types.nix index b225119299da1..e22bcd326c868 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); }; }; |