diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2017-04-30 14:42:55 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2017-04-30 15:56:41 +0300 |
| commit | 9be6c7b78f2a668aa1edcafa25c3dd1ba8ae6ad7 (patch) | |
| tree | 8db0743d00f83406e38e2c2c192751c778fe54c9 /modules/apps/memcached/instance.nix | |
| parent | 49659d55878d09827566902d07d01f051926aff2 (diff) | |
| download | nixsap-9be6c7b78f2a668aa1edcafa25c3dd1ba8ae6ad7.tar.gz | |
(* BREAKING *) Avoid ambiguous options
"either foo (listOf foo)" was not very useful
and interfered proper merging.
Diffstat (limited to 'modules/apps/memcached/instance.nix')
| -rw-r--r-- | modules/apps/memcached/instance.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/apps/memcached/instance.nix b/modules/apps/memcached/instance.nix index 102a287..ca6dc3f 100644 --- a/modules/apps/memcached/instance.nix +++ b/modules/apps/memcached/instance.nix @@ -9,7 +9,7 @@ let mkOption mkOptionType ; inherit (lib.types) - bool either enum int listOf nullOr package path str submodule ; + bool enum int listOf nullOr package path str submodule ; default = v: type: mkOption { type = type; default = v; }; optional = type: mkOption { type = nullOr type; default = null; }; @@ -46,7 +46,7 @@ in { B = optional (enum ["auto" "ascii" "binary"]); I = optional int; L = optional bool; - l = default "127.0.0.1" (either str (listOf str)); + l = default ["127.0.0.1"] (listOf str); b = optional int; c = optional int; f = optional float; |