diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2021-08-11 19:40:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 19:40:08 +0200 |
| commit | fcbead41af3421f258dc80249164ad63bcc9b3c9 (patch) | |
| tree | ade10086ee981595409d737d230a9b5f8bffe7ec | |
| parent | db6398e1ea47ce30033108c39228969390826c3e (diff) | |
| parent | 998a9c17078bfb328a1329494f082dfa13f97d9e (diff) | |
| download | nixpkgs-fcbead41af3421f258dc80249164ad63bcc9b3c9.tar nixpkgs-fcbead41af3421f258dc80249164ad63bcc9b3c9.tar.gz nixpkgs-fcbead41af3421f258dc80249164ad63bcc9b3c9.tar.bz2 nixpkgs-fcbead41af3421f258dc80249164ad63bcc9b3c9.tar.lz nixpkgs-fcbead41af3421f258dc80249164ad63bcc9b3c9.tar.xz nixpkgs-fcbead41af3421f258dc80249164ad63bcc9b3c9.tar.zst nixpkgs-fcbead41af3421f258dc80249164ad63bcc9b3c9.zip | |
Merge pull request #133402 from Infinisil/mergeEqualOption-uncomparable
lib/options: Better mergeEqualOption error for uncomparable types
| -rw-r--r-- | lib/options.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/options.nix b/lib/options.nix index 87cd8b79796..204c86df9f5 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -11,6 +11,7 @@ let filter foldl' head + tail isAttrs isBool isDerivation @@ -144,7 +145,7 @@ rec { if def.value != first.value then throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}" else - first) (head defs) defs).value; + first) (head defs) (tail defs)).value; /* Extracts values of all "value" keys of the given list. |