summary refs log tree commit diff
path: root/lib/options.nix
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2022-01-24 16:23:18 +0100
committerRobert Hensing <robert@roberthensing.nl>2022-01-24 16:23:18 +0100
commit8691ab3d47f1f9f94b51357fba7b8133cc8bcd88 (patch)
treecd6639301361babef4bb5609361b52524636da89 /lib/options.nix
parent4800f308413d03c39be5311ff63a218177af32df (diff)
downloadnixpkgs-8691ab3d47f1f9f94b51357fba7b8133cc8bcd88.tar
nixpkgs-8691ab3d47f1f9f94b51357fba7b8133cc8bcd88.tar.gz
nixpkgs-8691ab3d47f1f9f94b51357fba7b8133cc8bcd88.tar.bz2
nixpkgs-8691ab3d47f1f9f94b51357fba7b8133cc8bcd88.tar.lz
nixpkgs-8691ab3d47f1f9f94b51357fba7b8133cc8bcd88.tar.xz
nixpkgs-8691ab3d47f1f9f94b51357fba7b8133cc8bcd88.tar.zst
nixpkgs-8691ab3d47f1f9f94b51357fba7b8133cc8bcd88.zip
lib.modules: Define mergeOneOption in terms of mergeUniqueOption
Diffstat (limited to 'lib/options.nix')
-rw-r--r--lib/options.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/options.nix b/lib/options.nix
index 44ec335545c..ffe4b265166 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -128,11 +128,7 @@ rec {
     else if all isInt list && all (x: x == head list) list then head list
     else throw "Cannot merge definitions of `${showOption loc}'. Definition values:${showDefs defs}";
 
-  mergeOneOption = loc: defs:
-    if defs == [] then abort "This case should never happen."
-    else if length defs != 1 then
-      throw "The unique option `${showOption loc}' is defined multiple times. Definition values:${showDefs defs}"
-    else (head defs).value;
+  mergeOneOption = mergeUniqueOption { message = ""; };
 
   mergeUniqueOption = { message }: loc: defs:
     if length defs == 1