Skip to content

Update org-nvim tree sitter grammar#403455

Open
rynplynch wants to merge 5 commits intoNixOS:masterfrom
rynplynch:update-tree-sitter-grammars
Open

Update org-nvim tree sitter grammar#403455
rynplynch wants to merge 5 commits intoNixOS:masterfrom
rynplynch:update-tree-sitter-grammars

Conversation

@rynplynch
Copy link

@rynplynch rynplynch commented May 1, 2025

Things done

I ran the update script produced from the following command

nix-build -A tree-sitter.updater.update-all-grammars

I kept only the changes made to the tree-sitter-org-nvim.json file. This pull request updates all other grammars #402457. I am only updating the org-nvim grammar here.

I also changed the comment in default.nix file. It was inaccurate about the NIXPKGS_GITHUB_TOKEN env var. It is actually referred to as GITHUB_TOKEN

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels May 1, 2025
@NixOSInfra NixOSInfra added the 12.first-time contribution This PR is the author's first one; please be gentle! label May 1, 2025
@kimburgess
Copy link
Member

kimburgess commented May 2, 2025

I hit the same oddity the other day: #402457.

Also worth noting discussion in #343758.

It may be worth separating the change to the nvim-orgmode grammar and updates of others.

@rynplynch
Copy link
Author

I hit the same oddity the other day: #402457.

Also worth noting discussion in #343758.

It may be worth separating the change to the nvim-orgmode grammar and updates of others.

Sorry about that, didn't mean to create a redundent PR. I removed all other parser updates, keeping only nvim-orgmode.

Thanks for linking that discussion too.

How does this look now? Should I keep the change in the comments about the NIXPKGS_GITHUB_TOKEN env var?

@rynplynch rynplynch changed the title Update tree sitter grammars Update org-nvim tree sitter grammar May 2, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels May 2, 2025
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label May 8, 2025
@qweered
Copy link
Contributor

qweered commented Sep 15, 2025

Please squash your commits, see CONTRIBUTING.md

@qweered
Copy link
Contributor

qweered commented Sep 15, 2025

Copy link
Contributor

@qweered qweered left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved automatically following the successful run of nixpkgs-review.

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Sep 15, 2025
@teto
Copy link
Member

teto commented Dec 7, 2025

sry it took so long :/

@teto teto enabled auto-merge December 7, 2025 23:32
@teto teto added the 6.topic: tree-sitter Tree-sitter is a parser generator tool and an incremental parsing library. label Dec 7, 2025
@niklaskorz niklaskorz disabled auto-merge December 10, 2025 20:36
@niklaskorz
Copy link
Member

(auto merge is hanging on a GHA bug that failed to schedule one of the jobs, I can't retry it manually because it's too old, so a rebase and force push is needed)

@teto teto enabled auto-merge December 11, 2025 21:37
@teto teto disabled auto-merge December 11, 2025 21:37
@teto
Copy link
Member

teto commented Dec 11, 2025

can yoiu cleanup history before merging please ? 2 commits should be enough

Copy link
Member

@niklaskorz niklaskorz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR title and commit descriptions do not follow nixpkgs conventions, please see https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions

@teto
Copy link
Member

teto commented Dec 18, 2025

There has been some refacto of the treesitter infra, this now needs to be updated at pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix

@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: tree-sitter Tree-sitter is a parser generator tool and an incremental parsing library. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons. 12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants