Skip to content

Commit 98ca865

Browse files
committed
vimPlugins.nvim-treesitter: add workaround for #332580
A #319233 accidentally reverted #321550. Last one caused a very annoying regression to any Nix user (see #332580). I suppose this is a bug in upstream grammar, so I workaround it this way until it is properly resolved.
1 parent 7fc75e0 commit 98ca865

File tree

1 file changed

+9
-1
lines changed
  • pkgs/applications/editors/vim/plugins/nvim-treesitter

1 file changed

+9
-1
lines changed

pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,17 @@ self: super:
44

55
let
66
inherit (neovimUtils) grammarToPlugin;
7-
generatedGrammars = callPackage ./generated.nix {
7+
8+
initialGeneratedGrammars = callPackage ./generated.nix {
89
inherit (tree-sitter) buildGrammar;
910
};
11+
grammarOverrides = final: prev: {
12+
nix = prev.nix.overrideAttrs {
13+
# workaround for https://github.com/NixOS/nixpkgs/issues/332580
14+
prePatch = "rm queries/highlights.scm";
15+
};
16+
};
17+
generatedGrammars = lib.fix (lib.extends grammarOverrides (_: initialGeneratedGrammars));
1018

1119
generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars;
1220

0 commit comments

Comments
 (0)