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

[new-packages] tree-sitter-c, tree-sitter-lua, tree-sitter-markdown, tree-sitter-query, tree-sitter-vim, tree-sitter-vimdoc #23499

Merged
merged 2 commits into from
Mar 15, 2025

Conversation

calebabutler
Copy link
Contributor

These packages are dependencies for newer versions of neovim. Currently neovim gives an error when opening *.lua, *.c, *.md, *.vim, and when opening vim documentation since the program lacks these dependencies.

Proof they are now dependencies here and here.

@calebabutler
Copy link
Contributor Author

#23261

@calebabutler
Copy link
Contributor Author

@Biswa96 neovim maintainer

@@ -93,4 +99,7 @@ package() {
DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .

install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.txt"

# Symlink tree-sitter grammars directory to nvim runtime path
ln -s "${MINGW_PREFIX}/lib/tree_sitter" "${pkgdir}${MINGW_PREFIX}/share/nvim/runtime/parser"
Copy link
Collaborator

Choose a reason for hiding this comment

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

symlink won't work as you expect: https://www.msys2.org/docs/symlinks/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You are correct; this cannot be the best solution as it inadvertently bundles the tree-sitter-* so files with neovim. I changed it so that the tree-sitter-* packages add to the neovim runtime path directly in their respective packages.

Remove lib from dependency names

Fix so that clang can build

Remove symlink; add to neovim runtime path instead

Accidentally added package

remove unneccasary make makedepend
@ognevny ognevny force-pushed the add-neovim-dependencies branch from 42f989e to 95e90e5 Compare March 15, 2025 07:21
@ognevny
Copy link
Collaborator

ognevny commented Mar 15, 2025

I believe you've done a good work on testing it

I rebased some commits for a cleaner history. removed make entries in makedepends as it's always pulled with base-devel.

thanks

@ognevny ognevny merged commit 98ecdfb into msys2:master Mar 15, 2025
4 checks passed
@ognevny ognevny linked an issue Mar 15, 2025 that may be closed by this pull request
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

neovim creates wrong directory for parsers
2 participants