globals: refactor diffHook settings#15091
Merged
Ericson2314 merged 1 commit intoNixOS:masterfrom Jan 27, 2026
Merged
Conversation
amaanq
force-pushed
the
split-diff-hook-settings
branch
2 times, most recently
from
ae2d062 to
5fddc26
Compare
amaanq
changed the title
DiffHookSettingsdiffHook settings
amaanq
force-pushed
the
split-diff-hook-settings
branch
from
5fddc26 to
9e5ea1b
Compare
The settings related to diff hook (`run-diff-hook` and `diff-hook`) are a little redundant and don't need to be leaked in derivation-builder when computing the diff hook path to execute. Instead of directly using both `runDiffHook` and `diffHook` settings in derivation-builder, we can just encapsulate the logic to determine whether or not we have a diff hook executable to run in a helper function. We also mark `handleDiffHook` as static.
amaanq
force-pushed
the
split-diff-hook-settings
branch
from
9e5ea1b to
692102f
Compare
Ericson2314
approved these changes
Jan 26, 2026
Ericson2314
approved these changes
Jan 26, 2026
Member
Ericson2314
left a comment
Ericson2314
left a comment
There was a problem hiding this comment.
Small enough PR in pre-approved area that I feel comfortable merging my coworker's work
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Motivation
The settings related to diff hook (
run-diff-hookanddiff-hook) are a little redundant and don't need to be leaked in derivation-builder when computing the diff hook path to execute.Context
Instead of directly using both
runDiffHookanddiffHooksettings in derivation-builder, we can just encapsulate the logic to determine whether or not we have a diff hook executable to run in a helper function. We also markhandleDiffHookas static. Just note that the pr is purely a refactor.Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.