treewide: fix nvd diffs and internal cleanup #296
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This'll create some merge conflicts, but I'd like to get this fixed before I take an extended break. Fixes nvd diffs and supresses a redundant argument that would occur after #208. Also improves debug logging for references that we need to keep track of. Should help track down issues such as this one easier in the future.
CC @khaneliman for Darwin testing, seems to be working as intended on NixOS- testing for Home Manager would also be great.