diff options
| author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2009-11-05 16:36:03 +0000 |
|---|---|---|
| committer | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2009-11-05 16:36:03 +0000 |
| commit | 09bed4bffcfa6794e49397d39ab96c3177077161 (patch) | |
| tree | cc2a281ec9dbd6a5777a0e243f8a62fa376dbb40 /pkgs/lib/modules.nix | |
| parent | d8bbae877a6049867625ac86134422f8765b2157 (diff) | |
| download | nixpkgs-09bed4bffcfa6794e49397d39ab96c3177077161.tar nixpkgs-09bed4bffcfa6794e49397d39ab96c3177077161.tar.gz nixpkgs-09bed4bffcfa6794e49397d39ab96c3177077161.tar.bz2 nixpkgs-09bed4bffcfa6794e49397d39ab96c3177077161.tar.lz nixpkgs-09bed4bffcfa6794e49397d39ab96c3177077161.tar.xz nixpkgs-09bed4bffcfa6794e49397d39ab96c3177077161.tar.zst nixpkgs-09bed4bffcfa6794e49397d39ab96c3177077161.zip | |
* Report file locations in the stack-trace when multiple option
declarations cannot be merged. svn path=/nixpkgs/trunk/; revision=18149
Diffstat (limited to 'pkgs/lib/modules.nix')
| -rw-r--r-- | pkgs/lib/modules.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index 9bd3b4aab8c..8f6ae5666b1 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -217,9 +217,14 @@ rec { ) declarations; decl = - addOptionMakeUp - { name = addName name; recurseInto = recurseForOption; } - (mergeOptionDecls decls); + lib.addErrorContext "${eol + }while enhancing option '${addName name}'.${eol + }${errorSource declarations}${eol + }" ( + addOptionMakeUp + { name = addName name; recurseInto = recurseForOption; } + (mergeOptionDecls decls) + ); value = decl // (with config; { inherit (config) isNotDefined; |