diff options
author | Robert Hensing <robert@roberthensing.nl> | 2022-03-07 10:59:03 +0100 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2022-03-07 10:59:03 +0100 |
commit | db08290453ae0eb7622648435bf7af187929b153 (patch) | |
tree | b65a3114df971b2bddc68661bc65a4035b61558a /lib/modules.nix | |
parent | 20506699226b0dac5d423c6f6249f3cb15565169 (diff) | |
download | nixpkgs-db08290453ae0eb7622648435bf7af187929b153.tar nixpkgs-db08290453ae0eb7622648435bf7af187929b153.tar.gz nixpkgs-db08290453ae0eb7622648435bf7af187929b153.tar.bz2 nixpkgs-db08290453ae0eb7622648435bf7af187929b153.tar.lz nixpkgs-db08290453ae0eb7622648435bf7af187929b153.tar.xz nixpkgs-db08290453ae0eb7622648435bf7af187929b153.tar.zst nixpkgs-db08290453ae0eb7622648435bf7af187929b153.zip |
Revert "lib.modules: Remove redundant fixupOptionType in option injection"
This reverts commit 6b077c47ff14cb9a4a8f5cb8986fa83ff626c732. Thanks Infinisil for discovering this problem: > After a lot of trial and error, trying to prove why fixupOptionType should > be used here or not, I figured it out: It's needed for the sake of file > locations in error messages.
Diffstat (limited to 'lib/modules.nix')
-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 470e3818820..cc045391fcb 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -527,7 +527,7 @@ rec { # d. magically combine (a) and (c). # All of the above are merely syntax sugar though. then - let opt = mergeOptionDecls loc (map optionTreeToOption decls); + let opt = fixupOptionType loc (mergeOptionDecls loc (map optionTreeToOption decls)); in { matchedOptions = evalOptionValue loc opt defns'; unmatchedDefns = []; |