diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2020-03-05 23:21:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-05 23:21:02 +0100 |
| commit | 99a29107333c31be2db999d83bd0a5ba33afa8f7 (patch) | |
| tree | 6f0ae47589991f221f436c5a92f51b876c52905f /lib | |
| parent | 0508c93e836ba5a3a7c1f945ed78fd3cc307aba7 (diff) | |
| parent | 9c0ab2f26db26c21950e5c61fb06570cb4c5c79a (diff) | |
| download | nixpkgs-99a29107333c31be2db999d83bd0a5ba33afa8f7.tar nixpkgs-99a29107333c31be2db999d83bd0a5ba33afa8f7.tar.gz nixpkgs-99a29107333c31be2db999d83bd0a5ba33afa8f7.tar.bz2 nixpkgs-99a29107333c31be2db999d83bd0a5ba33afa8f7.tar.lz nixpkgs-99a29107333c31be2db999d83bd0a5ba33afa8f7.tar.xz nixpkgs-99a29107333c31be2db999d83bd0a5ba33afa8f7.tar.zst nixpkgs-99a29107333c31be2db999d83bd0a5ba33afa8f7.zip | |
Merge pull request #80919 from hercules-ci/modules-add-file-context
lib/modules.nix: Add file context to unmerged values in mergeDefinitions
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/modules.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index 2b1faf4f0c2..6cbef5632bd 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -389,7 +389,7 @@ rec { 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. |