From 6e7bc2c6c90335e7bb7d7ca8cef77c58f0e37444 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger <contact@infinisil.com> Date: Tue, 15 Sep 2020 20:30:48 +0200 Subject: [PATCH] lib/options: Fix mergeEqualOption for singular functions Previously it would error out for a single function definition --- lib/options.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/options.nix b/lib/options.nix index 38f4f1329f21..0494a597ab80 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -107,6 +107,10 @@ rec { /* "Merge" option definitions by checking that they all have the same value. */ mergeEqualOption = loc: defs: if defs == [] then abort "This case should never happen." + # Return early if we only have one element + # This also makes it work for functions, because the foldl' below would try + # to compare the first element with itself, which is false for functions + else if length defs == 1 then (elemAt defs 0).value else foldl' (val: def: if def.value != val then throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}."