tree-sitter: restore extraGrammars#536475
Closed
khaneliman wants to merge 1 commit into
Closed
Conversation
The grammar source refactor removed the hook overlays used to add grammars before builtGrammars is computed. Add it back so custom grammar sources populate tree-sitter.grammars, tree-sitter.builtGrammars, tree-sitter-grammars, and withPlugins from one override.
nixpkgs-ci
Bot
added
10.rebuild-darwin: 0
RossSmyth
approved these changes
Jun 29, 2026
RossSmyth
left a comment
RossSmyth
left a comment
Contributor
There was a problem hiding this comment.
I was going to say that one should almost always prefer overrideScope wrt modifying package set, but it seems the tree-sitter pkgset does not use that, and uses an ad-hoc extension API.
Looks good.
nixpkgs-ci
Bot
added
the
12.approvals: 1
13 tasks
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.
The grammar source refactor removed the hook overlays used to add grammars before builtGrammars is computed. Add it back so custom grammar sources populate tree-sitter.grammars, tree-sitter.builtGrammars, tree-sitter-grammars, and withPlugins from one override.
Follow up to #408414 to restore the
extraGrammarsarg that makes it easy to extend the set.Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.