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: revert #172850 for nix #173522

Merged
merged 1 commit into from
May 18, 2022

Conversation

wkral
Copy link
Contributor

@wkral wkral commented May 18, 2022

Description of changes

Repeating #165722 as the grammar got updated again while the issue hasn't been fixed upstream causing many errors in neovim.

Result of nixpkgs-review run on x86_64-linux 1

1 package built:
  • tree-sitter-grammars.tree-sitter-nix
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels May 18, 2022
@kraftnix
Copy link
Contributor

This revert fixes my neovim treesitter issue with nix as detailed in nix-community/tree-sitter-nix#27 while following nixos-unstable.

@siraben
Copy link
Member

siraben commented May 18, 2022

Maybe we should have a way to disable the update script from updating certain languages until a flag is removed, or put a warning in the update instructions about which grammars to revert, since people will periodically do grammar updates.

@siraben siraben merged commit 71f5501 into NixOS:master May 18, 2022
@adisbladis
Copy link
Member

adisbladis commented May 18, 2022

I would like to see someone with these problems provide more context and maybe create an upstream issue.
This was not broken on Emacs, so I wonder where the problem lies.

Edit: I had this open for a while and didn't see the comments before posting.

@adisbladis
Copy link
Member

I wonder if we shouldn't just apply nvim-treesitter/nvim-treesitter#2668 as a patch to nvim-treesitter instead as this isn't really a problem with the grammar itself.

pistachiology added a commit to pistachiology/dotfiles that referenced this pull request May 20, 2022
@tssm tssm mentioned this pull request May 26, 2022
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants