public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #80919 from hercules-ci/modules-add-file-context 

lib/modules.nix: Add file context to unmerged values in mergeDefinitions
This commit is contained in:
Robert Hensing 2020-03-05 23:21:02 +01:00 committed by GitHub
parent 0508c93e83 9c0ab2f26d
commit 99a2910733
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/modules.nix
View File

@ -389,7 +389,7 @@ rec {
let let
# Process mkMerge and mkIf properties. # Process mkMerge and mkIf properties.
defs' = concatMap (m: defs' = concatMap (m:
map (value: { inherit (m) file; inherit value; }) (dischargeProperties m.value) map (value: { inherit (m) file; inherit value; }) (builtins.addErrorContext "while evaluating definitions from `${m.file}':" (dischargeProperties m.value))
) defs; ) defs;
# Process mkOverride properties. # Process mkOverride properties.