Update treesitter org and org-nvim grammars to maintained fork#530059
Conversation
1e3bd37 to
3c67b61
Compare
|
|
It looks like this will finish out the list in #415851 once and for all as well? I think we should be able to remove support for that now. nvim-orgmode/tree-sitter-org@64cfbc2 |
This grammer isn't the same as https://github.com/nvim-neorg/tree-sitter-norg. The norg one is specifically for Neorg, not orgmode.nvim |
|
Whoops I missed that, thanks for the clarification. Appreciate the contribution regardless! 😆 |
|
All good! I also left a note over in your PR. Does look like that project is making some movement to rewrite in C |
aciceri
left a comment
There was a problem hiding this comment.
Have you considered defining org-nvim = org by making the attrset recurisive or something like that? (perhaps making a that big attrset recursive has efficiency implications?)
Honestly I had considered just outright dropping off the org-nvim grammer in favor of org since they're basically the same source anyway. 🤷🏾♀️ |
Feel free to do that! If for some reason something goes wrong building Besides helix the other most important consumer would be neovim I guess, but the grammar is not between its dependencies I see, perhaps people are expected to somehow enable it at runtime setting a variable or something like that, I've no idea how tree-sitter is supposed to work in neovim honestly. |
3c67b61 to
dc539db
Compare
|
|
🤔 The only real issue would be is perhaps the name of the package for neovim but im not sure how much exactly that matters. I may end up trying the |
|
@kristijanhusak by any chance, does the name of the package for the grammar matters? Seeing how most instances of how people utilize the grammar in their configs is the |
|
@NovaViper as long as we get |
Cool! Then I think we're good to go! I gave the pr a test with my custom neovim flake and it seems to pick up the grammar @kristijanhusak Can you confirm that this is the normal message that should be displayed for when it detects the grammar (but installed from another source)? |
It looks fine. By default we expect the parser to be in the same folder as the plugin, but it works even if it's somewhere else. |
dc539db to
aee9d0d
Compare
|
Fixed up typos |
|
aciceri
left a comment
There was a problem hiding this comment.
Approved automatically following the successful run of nixpkgs-review.
|
we usually would add an alias so users can migrate towards using the attribute name without breaking their config |
|
@teto Hm, I don't see any instances of a deprecation alias for namespaced packages. What would be the recommended way of adding an alias for |
|
you could do something like nixpkgs/pkgs/top-level/aliases.nix Line 2758 in 05eced6 |
d0d992b to
aeaeaf8
Compare
|
Done! @teto |
|
@NovaViper CI is failing! You need to lint or something :) |
| transmission_4-qt = transmission_4-qt5; # Added 2026-06-05 | ||
| travis = throw "'travis' has been removed because upstream has stopped maintaining it, and it contains dependencies with security vulnerabilities."; # Added 2026-02-14 | ||
| treefmt2 = throw "'treefmt2' has been renamed to/replaced by 'treefmt'"; # Converted to throw 2025-10-27 | ||
| tree-sitter-grammars.tree-sitter-org-nvim = throw "'tree-sitter-grammars.tree-sitter-org-nvim' has been renamed to/replaced by 'tree-sitter-grammars.tree-sitter-org'"; # Converted to throw 2026-06-18 |
There was a problem hiding this comment.
@aciceri Ah.. it looks like it didn't like what I did for the top-level aliases. Issue is I'm not exactly sure how I can implement this top-level alias without completely rewriting the larger tree-sitter grammar declaration 😬
… while calling the 'abort' builtin
at /home/runner/work/nixpkgs/nixpkgs/nixpkgs/untrusted/pkgs/top-level/aliases.nix:214:38:
213| n: alias:
214| if builtins.hasAttr n super then abort "Alias ${n} is still in all-packages.nix" else alias;
| ^
215|
error: evaluation aborted with the following error message: 'Alias tree-sitter-grammars is still in all-packages.nix'
|
Should be a |
Makes sense. You want me to wait til you get the aliases addition in nixpkgs or just update both grammars then drop org-nvim in another PR? |
Yeah, update would be fine for now. I have a branch with the aliases plumbing built on top of #537058 so will PR aliases work after the other scope PR gets through, first. |
fb60adc to
d64ac8a
Compare
|
Updated! |
✅
|
aciceri
left a comment
There was a problem hiding this comment.
Approved automatically following the successful run of nixpkgs-review.
Supersedes #403455
Switched both org and org-nvim treesitter grammars from old archived community repo to nvim-org's official org-nvim repo.
Changelog: nvim-orgmode/tree-sitter-org@v1.3.1...2.0.4
@aciceri
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.