[bug#63227] [PATCH 0/2] gnu: neovim: Update to 0.9.0

[bug#63227] [PATCH 0/2] gnu: neovim: Update to 0.9.0

[Benjamin]

Hello,

This is my first contribution to guix (and first time using git email
flow), so I hope I did everything as expected.

This patches update neovim to 0.9.0.

It was required to bump its dependency tree-sitter to 0.20.8 as 
there were some missing symbols with 0.20.7.
I also fixed the script avoiding to include gcc in dependencies 
as the makefile as moved.

Benjamin (2):
  gnu: tree-sitter: Update to 0.20.8
  gnu: neovim update to 0.9.0

 gnu/packages/tree-sitter.scm | 4 ++--
 gnu/packages/vim.scm         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)


base-commit: f21007ce4aceeacf5bbfc7cd45d526073141f194
-- 
2.39.2

[bug#63227] [PATCH 1/2] gnu: tree-sitter: Update to 0.20.8

[Benjamin]

---
 gnu/packages/tree-sitter.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index b91345bb36..386409914b 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -38,7 +38,7 @@ (define-module (gnu packages tree-sitter)
 (define-public tree-sitter
   (package
     (name "tree-sitter")
-    (version "0.20.7")
+    (version "0.20.8")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -47,7 +47,7 @@ (define-public tree-sitter
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1nv2a2hr22w8ix71b6rkkxv9rfvhvwlmyql0g6lva9qzj4vy50p4"))
+                "10w17lfn9asqrk612xivkx26lc620s3nnm30hhlyqd4bj19k7gyv"))
               (modules '((guix build utils)))
               (snippet #~(begin
                            ;; Remove bundled ICU parts
-- 
2.39.2

[bug#63227] [PATCH 2/2] gnu: neovim update to 0.9.0

[Benjamin]

---
 gnu/packages/vim.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index d555194d0b..e5e9d67c4b 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -693,7 +693,7 @@ (define-public neovim-syntastic
 (define-public neovim
   (package
     (name "neovim")
-    (version "0.8.3")
+    (version "0.9.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -702,7 +702,7 @@ (define-public neovim
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1zff73yxbnxym6sn43xk6r0zc2ncingsib81v9g39ibrcinpwaa9"))))
+                "0xsvhm191cy5ivcw0c8dnpzbpcvvn5hsnkzkipr2aabgrsgqj628"))))
     (build-system cmake-build-system)
     (arguments
      (list #:modules
@@ -751,8 +751,8 @@ (define-public neovim
                  (lambda _
                    ;; nvim remembers its build options, including the compiler with
                    ;; its complete path.  This adds gcc to the closure of nvim, which
-                   ;; doubles its size.  We remove the refirence here.
-                   (substitute* "cmake/GetCompileFlags.cmake"
+                   ;; doubles its size.  We remove the reference here.
+                   (substitute* "cmake.config/versiondef.h.in"
                      (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc"))
                    #t)))))
     (inputs (list libuv-for-luv
-- 
2.39.2

[bug#63227] [PATCH 0/2] gnu: neovim: Update to 0.9.0

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1223 bytes --]

Thanks for the patch!

On Tue, May 02, 2023 at 01:25:02AM +0200, Benjamin wrote:
> Hello,
> 
> This is my first contribution to guix (and first time using git email
> flow), so I hope I did everything as expected.

There's a file in the guix tree at etc/committer.scm which takes care of
some of the less complex commit messages. I rounded out your commit
messages but otherwise everything looks good.

> This patches update neovim to 0.9.0.
> 
> It was required to bump its dependency tree-sitter to 0.20.8 as 
> there were some missing symbols with 0.20.7.
> I also fixed the script avoiding to include gcc in dependencies 
> as the makefile as moved.
> 
> Benjamin (2):
>   gnu: tree-sitter: Update to 0.20.8
>   gnu: neovim update to 0.9.0
> 
>  gnu/packages/tree-sitter.scm | 4 ++--
>  gnu/packages/vim.scm         | 8 ++++----
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> 
> base-commit: f21007ce4aceeacf5bbfc7cd45d526073141f194
> -- 
> 2.39.2

Patch pushed.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]