Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tree-sitter: 0.24.4 -> 0.24.6 #368952

Merged
merged 1 commit into from
Dec 29, 2024
Merged

Conversation

khaneliman
Copy link
Contributor

@khaneliman khaneliman commented Dec 28, 2024

Things done

Getting hard freezes of neovim since #355429 trying to bump tree-sitter to see if it resolves it.

Resolves #368247

Issues:
tree-sitter/tree-sitter#3930
neovim/neovim#31163

Changelogs:
https://github.com/tree-sitter/tree-sitter/releases/tag/v0.24.5
https://github.com/tree-sitter/tree-sitter/releases/tag/v0.24.6

I see that the previous version was backported to 24.11, should that be reverted or should we backport this as well?

  • 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.

Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

I've also been plagued by this issue and was debugging this in the past without much success. In my case, I could reliably trigger this by editing any file in a nixpkgs checkout with the nix tree-sitter grammar enabled. Disabling the nix grammar fixed the issue.

This PR fixes the issue reliably with the nix grammar enabled. Thanks a lot. 🎉

@GaetanLepage GaetanLepage merged commit 4cd8371 into NixOS:staging Dec 29, 2024
22 of 23 checks passed
@khaneliman khaneliman deleted the tree-sitter branch December 29, 2024 00:51
@khaneliman khaneliman added the backport staging-24.11 Backport PR automatically label Dec 29, 2024
@nix-backports
Copy link

nix-backports bot commented Dec 29, 2024

Successfully created backport PR for staging-24.11:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport staging-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants