From 0f2bd6c3053b27ab797c6eb662c00e77ec9cfffe Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Sun, 23 Nov 2008 00:19:12 +0000 Subject: [PATCH] mergeDefaultOption: handle boolean values. svn path=/nixpkgs/trunk/; revision=13371 --- pkgs/lib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix index 95fe7ae9c46..09fd1130d07 100644 --- a/pkgs/lib/default.nix +++ b/pkgs/lib/default.nix @@ -399,6 +399,7 @@ rec { else if all __isFunction list then x: mergeDefaultOption (map (f: f x) list) else if all __isList list then concatLists list else if all __isAttrs list then mergeAttrs list + else if all (x: true == x || false == x) list then fold logicalOR false list else abort "${name}: Cannot merge values."; mergeTypedOption = typeName: predicate: merge: name: list: