From 9be6c7b78f2a668aa1edcafa25c3dd1ba8ae6ad7 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Sun, 30 Apr 2017 14:42:55 +0300 Subject: (* BREAKING *) Avoid ambiguous options "either foo (listOf foo)" was not very useful and interfered proper merging. --- modules/apps/memcached/instance.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/apps/memcached') 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; -- cgit v1.2.3