From 1045f12f00dff46ab320bdd89e76456dc9eae1cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Mon, 9 Feb 2026 07:45:43 +0100 Subject: gnu: neovim: honor TREE_SITTER_GRAMMAR_PATH. While at it, also depend on tree-sitters that are builtin into neovim. Fixes #2269 * packages/patches/neovim-tree-sitter-grammar-path.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/vim.scm (neovim): Support TREE_SITTER_GRAMMAR_PATH. [source] : Add patch. [native-search-paths]: Add TREE_SITTER_GRAMMAR_PATH. [propagated-inputs]: Add strictly required tree-sitter parsers. --- gnu/packages/vim.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index c37131cb7a3..08bc2d9c043 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -801,7 +801,8 @@ is based on Vim's builtin plugin support.") (file-name (git-file-name name version)) (sha256 (base32 - "1b524vi44gkcsyy8w4jggvprwdsgy0gjprgxpyhh0dmqm47c0c48")))) + "1b524vi44gkcsyy8w4jggvprwdsgy0gjprgxpyhh0dmqm47c0c48")) + (patches (search-patches "neovim-tree-sitter-grammar-path.patch")))) (build-system cmake-build-system) (arguments (list #:tests? #f @@ -852,6 +853,19 @@ is based on Vim's builtin plugin support.") lua5.1-libmpack tree-sitter)) (native-inputs (list pkg-config gettext-minimal gperf)) + (propagated-inputs + ;; bundled tree-sitters, neovim assumes that these are available. + ;; See https://neovim.io/doc/user/treesitter.html#treesitter-parsers + (list tree-sitter-c + tree-sitter-lua + tree-sitter-markdown + tree-sitter-vim + tree-sitter-vimdoc + tree-sitter-query)) + (native-search-paths + (list (search-path-specification + (variable "TREE_SITTER_GRAMMAR_PATH") + (files '("lib/tree-sitter"))))) (home-page "https://neovim.io") (synopsis "Fork of vim focused on extensibility and agility") (description -- cgit v1.2.3