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

lib/modules.nix: Add file context to unmerged values in mergeDefinitions

Changed files
+1 -1
lib
+1 -1
lib/modules.nix
···
let
# Process mkMerge and mkIf properties.
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;
# Process mkOverride properties.