Update Request: nvim-treesitter `master` branch → `main?` branch

[JonBoyleCoding]

Nixpkgs version

• Unstable (25.11)

Package name

nvim-treesitter

Upstream version

https://github.com/nvim-treesitter/nvim-treesitter/tree/main ? The developer has asked not to blindly do this - see my comment below.

Nixpkgs version

2025-05-24

Changelog

No response

Additional context

It looks like nvim-treesitter has changed to using main rather than master, and the current commit is from the master branch. They haven't updated the master branch in a few months other than to say they are archiving it.

The commit used is on the master branch and has a couple hundred missing commits from main.

nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix

Lines 11249 to 11260 in 3e3afe5

	nvim-treesitter = buildVimPlugin {
	pname = "nvim-treesitter";
	version = "2025-05-24";
	src = fetchFromGitHub {
	owner = "nvim-treesitter";
	repo = "nvim-treesitter";
	rev = "42fc28ba918343ebfd5565147a42a26580579482";
	sha256 = "1ck1qslxwi18qxrga68blvk1dg9j4jn65xiw8snq5pk06waksnq9";
	};
	meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
	meta.hydraPlatforms = [ ];
	};

This causes some issues with lack of grammar updates.

I saw this referenced #411256 (comment) - but that was in an issue for treesitter not nvim-treesitter directly and has been closed.

Notify maintainers

@figsoda

---

Note for maintainers: Please tag this issue in your pull request description. (i.e. Resolves #ISSUE.)

I assert that this issue is relevant for Nixpkgs

• I assert that this package update does not yet exist in an open pull request or in Nixpkgs Unstable.
• I assert that this is not a duplicate of any known issue.
• I assert that I have read the NixOS Code of Conduct and agree to abide by it.

Is this issue important to you?

Add a 👍 reaction to issues you find important.

[JonBoyleCoding]

Before blindly updating, the developer had this comment on my original issue:

nvim-treesitter/nvim-treesitter#7944 (comment)

No, don't do that! I do not want "distributions" blindly switching to the main branch, which is an incompatible rewrite and will be massively breaking to users.
Instead, they should fix their mess where they do not install the parser versions that are specified here; queries are only guaranteed to be compatible with the exact commit tracked in the lockfile.

[JonBoyleCoding]

Just for reference, my original issue was that the GDScript highlights were outdated. I see there are a number of scripts in nixpkgs, so my issue is something different to this being outdated. I don't have time to read the scripts and understand what's going on right now.

[guillermofbriceno]

Want to add that since the verilog grammar has switched to systemverilog in both nixpkgs and nvim-treesitter main, but not master, parsing verilog is currently broken.

[iofq]

if anyone would like to adopt the main branch, it can be done by adding nvim-treesitter main branch to flake inputs:

inputs = {
  nvim-treesitter = {
    url = "github:nvim-treesitter/nvim-treesitter/main";
    flake = false;
  };
}

and using this overlay:

{ inputs, ... }:
final: prev:
{
  vimPlugins = prev.vimPlugins.extend (
    final': prev': {
      nvim-treesitter = prev'.nvim-treesitter.overrideAttrs (old: rec {
        src = inputs.nvim-treesitter;
        name = "${old.pname}-${src.rev}";
        postPatch = "";
        # ensure runtime queries get linked to RTP (:TSInstall does this too)
        buildPhase = "
          mkdir -p $out/queries
          cp -a $src/runtime/queries/* $out/queries
        ";
        nvimSkipModules = [ "nvim-treesitter._meta.parsers" ];
      });
    }
  );
}

The buildPhase part is a bit of a hack (ideally you'd only copy grammars defined using withPlugins), and I'm not sure what this master->main migration would look like on the nixpkgs side, so I'll leave this as-is for now.

[PerchunPak]

CC @NixOS/neovim

[mrcjkb]

nvim-treesitter/nvim-treesitter#7895 (comment)

We should hold off on migrating in nixpkgs until nvim-treesitter has an official release. And when that happens, we should probably pin the release tags.

Perhaps we could create a nix-community nvim-treesitter-main overlay for users who want to use the main branch in the meantime...

[iofq]

I wrote a nixpkgs overlay for those that want to use the main branch today:

https://github.com/iofq/nvim-treesitter-main