From f672dbc5670a661c08235b5eab5925dcc8e737fc Mon Sep 17 00:00:00 2001 From: bhagwan Date: Fri, 7 Apr 2023 12:34:13 -0700 Subject: [PATCH 1/2] neovim: update to 0.9.0 --- .../patches/cmake-allow-build-type-none.patch | 20 +++++++++---------- srcpkgs/neovim/template | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch b/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch index d98563e00252..7654cc64a872 100644 --- a/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch +++ b/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch @@ -18,14 +18,14 @@ else() message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") endif() ---- a/runtime/autoload/health/nvim.vim -+++ b/runtime/autoload/health/nvim.vim -@@ -135,7 +135,7 @@ function! s:check_performance() abort - let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+') - if empty(buildtype) - call health#report_error('failed to get build type from :version') -- elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)' -+ elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|None)' - call health#report_ok(buildtype) +--- a/runtime/lua/nvim/health.lua ++++ b/runtime/lua/nvim/health.lua +@@ -152,7 +152,7 @@ + local buildtype = vim.fn.matchstr(vim.fn.execute('version'), [[\v\cbuild type:?\s*[^\n\r\t ]+]]) + if empty(buildtype) then + health.report_error('failed to get build type from :version') +- elseif vim.regex([[\v(MinSizeRel|Release|RelWithDebInfo)]]):match_str(buildtype) then ++ elseif vim.regex([[\v(MinSizeRel|Release|RelWithDebInfo|None)]]):match_str(buildtype) then + health.report_ok(buildtype) else - call health#report_info(buildtype) + health.report_info(buildtype) diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template index 9c7a73bf6fb2..dfab9fb5a42c 100644 --- a/srcpkgs/neovim/template +++ b/srcpkgs/neovim/template @@ -1,6 +1,6 @@ # Template file for 'neovim' pkgname=neovim -version=0.8.3 +version=0.9.0 revision=1 build_style=cmake build_helper="qemu" @@ -16,7 +16,7 @@ maintainer="Marcin Puc " license="Apache-2.0, Vim" homepage="https://neovim.io" distfiles="https://github.com/neovim/neovim/archive/refs/tags/v${version}.tar.gz" -checksum=adf45ff160e1d89f519b6114732eba03485ae469beb27919b0f7a4f6b44233c1 +checksum=39d79107c54d2f3babcad2cd157c399241c04f6e75e98c18e8afaf2bb5e82937 build_options=luajit From caccf38b4b0ec66196c29e6eb9036324dc28df8c Mon Sep 17 00:00:00 2001 From: bhagwan Date: Fri, 7 Apr 2023 13:16:08 -0700 Subject: [PATCH 2/2] tree-sitter: update to 0.20.8 --- srcpkgs/tree-sitter/template | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template index 2f1e958598ba..575aee5bdabb 100644 --- a/srcpkgs/tree-sitter/template +++ b/srcpkgs/tree-sitter/template @@ -1,6 +1,6 @@ # Template file for 'tree-sitter' pkgname=tree-sitter -version=0.20.7 +version=0.20.8 revision=1 build_style=cargo make_install_args="--path=cli" @@ -9,14 +9,9 @@ maintainer="Érico Nogueira " license="MIT" homepage="https://tree-sitter.github.io" distfiles="https://github.com/tree-sitter/tree-sitter/archive/v${version}.tar.gz" -checksum=b355e968ec2d0241bbd96748e00a9038f83968f85d822ecb9940cbe4c42e182e +checksum=6181ede0b7470bfca37e293e7d5dc1d16469b9485d13f13a605baec4a8b1f791 make_check=no # tests require generating fixtures from remote repositories -post_patch() { - # fixes an indexmap error when cross compiling - cargo update --package autocfg:1.0.1 --precise 1.1.0 -} - post_build() { # Build libtree-sitter, since do_build builds the tree-sitter CLI. make