* [bug#53523] [PATCH 1/2] gnu: neovim: Update to 0.6.1.
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
@ 2022-01-25 16:56 ` Luis Henrique Gomes Higino
2022-01-25 16:56 ` [bug#53523] [PATCH 2/2] gnu: Add neovim-luajit Luis Henrique Gomes Higino
2022-01-28 10:00 ` [bug#53523] [PATCH] gnu: Add tree-sitter Nicolas Goaziou
` (14 subsequent siblings)
15 siblings, 1 reply; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-01-25 16:56 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim): Update to 0.6.1.
---
gnu/packages/vim.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index d5667851a8..7a43044caa 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Tissevert <tissevert+guix@marvid.fr>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -661,7 +662,7 @@ (define-public neovim-syntastic
(define-public neovim
(package
(name "neovim")
- (version "0.4.4")
+ (version "0.6.1")
(source
(origin
(method git-fetch)
@@ -670,7 +671,7 @@ (define-public neovim
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"))))
+ (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((srfi srfi-26)
@@ -721,7 +722,8 @@ (define-public neovim
("lua-luv" ,lua5.1-luv)
("lua-lpeg" ,lua5.1-lpeg)
("lua-bitop" ,lua5.1-bitop)
- ("lua-libmpack" ,lua5.1-libmpack)))
+ ("lua-libmpack" ,lua5.1-libmpack)
+ ("tree-sitter" ,tree-sitter)))
(native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [bug#53523] [PATCH 2/2] gnu: Add neovim-luajit.
2022-01-25 16:56 ` [bug#53523] [PATCH 1/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
@ 2022-01-25 16:56 ` Luis Henrique Gomes Higino
2022-01-25 17:39 ` Maxime Devos
0 siblings, 1 reply; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-01-25 16:56 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim-luajit): New variable.
---
gnu/packages/vim.scm | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 7a43044caa..9d06089492 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -743,6 +743,19 @@ (define-public neovim
;; except for parts that were contributed under the Vim license.
(license (list license:asl2.0 license:vim))))
+(define-public neovim-luajit
+ (package
+ (inherit neovim)
+ (name "neovim-luajit")
+ (inputs (modify-inputs (package-inputs neovim)
+ (replace "lua" luajit)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments neovim)
+ ((#:configure-flags cf) `(delete "-DPREFER_LUA:BOOL=YES"
+ ,cf))))
+ (synopsis
+ "Fork of vim focused on extensibility and agility - built with LuaJIT")))
+
(define-public eovim
(package
(name "eovim")
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [bug#53523] [PATCH 2/2] gnu: Add neovim-luajit.
2022-01-25 16:56 ` [bug#53523] [PATCH 2/2] gnu: Add neovim-luajit Luis Henrique Gomes Higino
@ 2022-01-25 17:39 ` Maxime Devos
2022-01-26 11:28 ` Luis Henrique Gomes Higino
2022-01-26 11:48 ` Efraim Flashner
0 siblings, 2 replies; 48+ messages in thread
From: Maxime Devos @ 2022-01-25 17:39 UTC (permalink / raw)
To: Luis Henrique Gomes Higino, 53523
[-- Attachment #1: Type: text/plain, Size: 807 bytes --]
Luis Henrique Gomes Higino schreef op di 25-01-2022 om 13:56 [-0300]:
> * gnu/packages/vim.scm (neovim-luajit): New variable.
> +(define-public neovim-luajit
> + (package
> + (inherit neovim)
> + (name "neovim-luajit")
> + (inputs (modify-inputs (package-inputs neovim)
> + (replace "lua" luajit)))
> + (arguments
> + (substitute-keyword-arguments (package-arguments neovim)
> + ((#:configure-flags cf) `(delete "-DPREFER_LUA:BOOL=YES"
> + ,cf))))
> + (synopsis
> + "Fork of vim focused on extensibility and agility - built with LuaJIT")))
Does this need to be a separate package? I.e., can we use luajit
in the 'neovim' package on systems that support luajit, so not for
powerpc)?
Greetings,
Maxime.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread
* [bug#53523] [PATCH 2/2] gnu: Add neovim-luajit.
2022-01-25 17:39 ` Maxime Devos
@ 2022-01-26 11:28 ` Luis Henrique Gomes Higino
2022-01-26 11:48 ` Efraim Flashner
1 sibling, 0 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-01-26 11:28 UTC (permalink / raw)
To: Maxime Devos; +Cc: 53523
Maxime Devos <maximedevos@telenet.be> writes:
> [[PGP Signed Part:Undecided]]
> Luis Henrique Gomes Higino schreef op di 25-01-2022 om 13:56
> [-0300]:
>> * gnu/packages/vim.scm (neovim-luajit): New variable.
>> +(define-public neovim-luajit
>> + (package
>> + (inherit neovim)
>> + (name "neovim-luajit")
>> + (inputs (modify-inputs (package-inputs neovim)
>> + (replace "lua" luajit)))
>> + (arguments
>> + (substitute-keyword-arguments (package-arguments neovim)
>> + ((#:configure-flags cf) `(delete
>> "-DPREFER_LUA:BOOL=YES"
>> + ,cf))))
>> + (synopsis
>> + "Fork of vim focused on extensibility and agility - built
>> with LuaJIT")))
>
> Does this need to be a separate package? I.e., can we use
> luajit
> in the 'neovim' package on systems that support luajit, so not
> for
> powerpc)?
>
> Greetings,
> Maxime.
>
> [[End of PGP Signed Part]]
I initially choose a package variant because it seemed the easiest
way to permit
both, but I think we can choose which implementation of Lua to use
based on
the target's architecture and it is possibly a better solution. My
only
problem with it is that I'm not sure this conforms to the
reproducible
building mindset. If choosing a dependency based on hardware is
OK for Guix, I'll configure `qemu-binfmt-service-type` and try to
implement this.
--
Regards,
Luis H. Higino
^ permalink raw reply [flat|nested] 48+ messages in thread
* [bug#53523] [PATCH 2/2] gnu: Add neovim-luajit.
2022-01-25 17:39 ` Maxime Devos
2022-01-26 11:28 ` Luis Henrique Gomes Higino
@ 2022-01-26 11:48 ` Efraim Flashner
2022-01-26 12:07 ` Luis Henrique Gomes Higino
1 sibling, 1 reply; 48+ messages in thread
From: Efraim Flashner @ 2022-01-26 11:48 UTC (permalink / raw)
To: Maxime Devos; +Cc: Luis Henrique Gomes Higino, 53523
[-- Attachment #1: Type: text/plain, Size: 1274 bytes --]
On Tue, Jan 25, 2022 at 05:39:05PM +0000, Maxime Devos wrote:
> Luis Henrique Gomes Higino schreef op di 25-01-2022 om 13:56 [-0300]:
> > * gnu/packages/vim.scm (neovim-luajit): New variable.
> > +(define-public neovim-luajit
> > + (package
> > + (inherit neovim)
> > + (name "neovim-luajit")
> > + (inputs (modify-inputs (package-inputs neovim)
> > + (replace "lua" luajit)))
> > + (arguments
> > + (substitute-keyword-arguments (package-arguments neovim)
> > + ((#:configure-flags cf) `(delete "-DPREFER_LUA:BOOL=YES"
> > + ,cf))))
> > + (synopsis
> > + "Fork of vim focused on extensibility and agility - built with LuaJIT")))
>
> Does this need to be a separate package? I.e., can we use luajit
> in the 'neovim' package on systems that support luajit, so not for
> powerpc)?
I believe in the past we've discussed using luajit as the default lua
for neovim. My guess is we should fall back to lua(-5.1?) on
(not (package-supported-system luajit))
--
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 --]
^ permalink raw reply [flat|nested] 48+ messages in thread
* [bug#53523] [PATCH 2/2] gnu: Add neovim-luajit.
2022-01-26 11:48 ` Efraim Flashner
@ 2022-01-26 12:07 ` Luis Henrique Gomes Higino
2022-01-26 14:22 ` Efraim Flashner
0 siblings, 1 reply; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-01-26 12:07 UTC (permalink / raw)
To: Efraim Flashner; +Cc: Maxime Devos, 53523
Efraim Flashner <efraim@flashner.co.il> writes:
> [[PGP Signed Part:Undecided]]
> On Tue, Jan 25, 2022 at 05:39:05PM +0000, Maxime Devos wrote:
>> Luis Henrique Gomes Higino schreef op di 25-01-2022 om 13:56
>> [-0300]:
>> > * gnu/packages/vim.scm (neovim-luajit): New variable.
>> > +(define-public neovim-luajit
>> > + (package
>> > + (inherit neovim)
>> > + (name "neovim-luajit")
>> > + (inputs (modify-inputs (package-inputs neovim)
>> > + (replace "lua" luajit)))
>> > + (arguments
>> > + (substitute-keyword-arguments (package-arguments
>> > neovim)
>> > + ((#:configure-flags cf) `(delete
>> > "-DPREFER_LUA:BOOL=YES"
>> > + ,cf))))
>> > + (synopsis
>> > + "Fork of vim focused on extensibility and agility - built
>> > with
LuaJIT")))
>>
>> Does this need to be a separate package? I.e., can we use
>> luajit
>> in the 'neovim' package on systems that support luajit, so not
>> for
>> powerpc)?
>
> I believe in the past we've discussed using luajit as the
> default lua
> for neovim. My guess is we should fall back to lua(-5.1?) on
> (not (package-supported-system luajit))
Yes, I believe this is the best solution if it is acceptable by
Guix standards.
--
Regards,
Luis H. Higino
^ permalink raw reply [flat|nested] 48+ messages in thread
* [bug#53523] [PATCH 2/2] gnu: Add neovim-luajit.
2022-01-26 12:07 ` Luis Henrique Gomes Higino
@ 2022-01-26 14:22 ` Efraim Flashner
0 siblings, 0 replies; 48+ messages in thread
From: Efraim Flashner @ 2022-01-26 14:22 UTC (permalink / raw)
To: Luis Henrique Gomes Higino; +Cc: Maxime Devos, 53523
[-- Attachment #1: Type: text/plain, Size: 1797 bytes --]
On Wed, Jan 26, 2022 at 09:07:04AM -0300, Luis Henrique Gomes Higino wrote:
>
> Efraim Flashner <efraim@flashner.co.il> writes:
>
> > [[PGP Signed Part:Undecided]]
> > On Tue, Jan 25, 2022 at 05:39:05PM +0000, Maxime Devos wrote:
> > > Luis Henrique Gomes Higino schreef op di 25-01-2022 om 13:56
> > > [-0300]:
> > > > * gnu/packages/vim.scm (neovim-luajit): New variable.
> > > > +(define-public neovim-luajit
> > > > + (package
> > > > + (inherit neovim)
> > > > + (name "neovim-luajit")
> > > > + (inputs (modify-inputs (package-inputs neovim)
> > > > + (replace "lua" luajit)))
> > > > + (arguments
> > > > + (substitute-keyword-arguments (package-arguments > neovim)
> > > > + ((#:configure-flags cf) `(delete > "-DPREFER_LUA:BOOL=YES"
> > > > + ,cf))))
> > > > + (synopsis
> > > > + "Fork of vim focused on extensibility and agility - built > with
> LuaJIT")))
> > >
> > > Does this need to be a separate package? I.e., can we use luajit
> > > in the 'neovim' package on systems that support luajit, so not for
> > > powerpc)?
> >
> > I believe in the past we've discussed using luajit as the default lua
> > for neovim. My guess is we should fall back to lua(-5.1?) on
> > (not (package-supported-system luajit))
>
> Yes, I believe this is the best solution if it is acceptable by Guix
> standards.
IMO it's basically the same as only adding pandoc for systems with
Haskell support. I think we have a couple of other examples I can't
think of right now.
--
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 --]
^ permalink raw reply [flat|nested] 48+ messages in thread
* [bug#53523] [PATCH] gnu: Add tree-sitter.
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
2022-01-25 16:56 ` [bug#53523] [PATCH 1/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
@ 2022-01-28 10:00 ` Nicolas Goaziou
2022-01-28 12:39 ` [bug#53523] (no subject) Luis Henrique Gomes Higino
` (13 subsequent siblings)
15 siblings, 0 replies; 48+ messages in thread
From: Nicolas Goaziou @ 2022-01-28 10:00 UTC (permalink / raw)
To: Luis Henrique Gomes Higino; +Cc: 53523
Hello,
Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com> writes:
> this series of patches adds the new required dependency for neovim,
> tree-sitter, updates neovim to the newest upstream version and adds
> the package variant neovim-luajit, which switches the lua
> implementation used from Lua 5.1 to LuaJIT 2.1.0-beta3.
>
> * gnu/packages/text-editors.scm (tree-sitter): New variable.
Thank you.
Note there is already a pending patch set to add tree-sitter in Guix:
<https://issues.guix.gnu.org/issue/49946/>. You may want to look at it
and see if both works can be merged somehow.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 48+ messages in thread* [bug#53523] (no subject)
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
2022-01-25 16:56 ` [bug#53523] [PATCH 1/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
2022-01-28 10:00 ` [bug#53523] [PATCH] gnu: Add tree-sitter Nicolas Goaziou
@ 2022-01-28 12:39 ` Luis Henrique Gomes Higino
2022-02-01 13:04 ` [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (12 subsequent siblings)
15 siblings, 0 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-01-28 12:39 UTC (permalink / raw)
To: 53523; +Cc: Efraim Flashner, Nicolas Goaziou
I'll try implementing what Efraim Flashner suggested. Then, I'll
see if I can merge my first patch, the one that adds tree-sitter, with the one mentioned by
Nicolas Goaziou. If anyone can point me to a resource on how this
could be done in regards to the technicalities, feel free to share
it! Thanks for the feedback!
Regards,
--
Luis H. Higino
^ permalink raw reply [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter.
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (2 preceding siblings ...)
2022-01-28 12:39 ` [bug#53523] (no subject) Luis Henrique Gomes Higino
@ 2022-02-01 13:04 ` Luis Henrique Gomes Higino
2022-02-01 13:04 ` [bug#53523] [PATCH v2 2/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
` (4 more replies)
2022-02-05 19:41 ` [bug#53523] About luajit supported platforms Luis Henrique Gomes Higino
` (11 subsequent siblings)
15 siblings, 5 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-02-01 13:04 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
Hi guixers,
this adds tree-sitter, just as the previous patch series, but now
there is no neovim-luajit and neovim uses LuaJIT on supported
platforms.
--
Regards,
Luis H. Higino
* gnu/packages/text-editors.scm (tree-sitter): New variable.
---
gnu/packages/text-editors.scm | 45 +++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 2c5f5de719..9273a8f10b 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2021 Calum Irwin <calumirwin1@gmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1165,3 +1166,47 @@ (define-public virtaal
provided by the Translate Toolkit, including XLIFF and PO.")
(home-page "https://virtaal.translatehouse.org/")
(license license:gpl2+)))
+
+(define-public tree-sitter
+ (package
+ (name "tree-sitter")
+ (version "0.20.4")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1yldgdbf3l5l4ki52abdf81nwkcbvg219gwr3ydcjwfsg7hf7zhz"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'unpack 'fix-hardcoded-paths
+ (lambda _
+ (substitute* "Makefile"
+ (("/usr/local") (assoc-ref %outputs "out"))))))
+ #:tests? #f
+ #:make-flags
+ (list (string-append "prefix="
+ (assoc-ref %outputs "out"))
+ (string-append "CC="
+ ,(cc-for-target)))))
+ (home-page "https://tree-sitter.github.io/tree-sitter/")
+ (synopsis "Incremental parsing system for programming tools")
+ (description
+ "Tree-sitter is a parser generator tool and an incremental parsing
+library. It can build a concrete syntax tree for a source file and efficiently
+update the syntax tree as the source file is edited. Tree-sitter aims to be:
+
+@itemize
+@item General enough to parse any programming language
+@item Fast enough to parse on every keystroke in a text editor
+@item Robust enough to provide useful results even in the presence of syntax errors
+@item Dependency-free so that the runtime library (which is written in pure C)
+can be embedded in any application
+@end itemize
+")
+ (license license:expat)))
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v2 2/2] gnu: neovim: Update to 0.6.1.
2022-02-01 13:04 ` [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
@ 2022-02-01 13:04 ` Luis Henrique Gomes Higino
2022-02-05 11:02 ` Maxime Devos
2022-02-05 11:09 ` [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter Maxime Devos
` (3 subsequent siblings)
4 siblings, 1 reply; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-02-01 13:04 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim): Update to 0.6.1.
Build neovim with LuaJIT in the supported platforms.
---
gnu/packages/vim.scm | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index d5667851a8..942df27107 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Tissevert <tissevert+guix@marvid.fr>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -661,7 +662,7 @@ (define-public neovim-syntastic
(define-public neovim
(package
(name "neovim")
- (version "0.4.4")
+ (version "0.6.1")
(source
(origin
(method git-fetch)
@@ -670,13 +671,18 @@ (define-public neovim
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"))))
+ (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((srfi srfi-26)
(guix build cmake-build-system)
(guix build utils))
- #:configure-flags '("-DPREFER_LUA:BOOL=YES")
+ #:configure-flags
+ (list ,@(if (member (or (%current-target-system)
+ (%current-system))
+ (package-supported-systems luajit))
+ '()
+ '("-DPREFER_LUA:BOOL=YES")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-lua-paths
@@ -717,11 +723,16 @@ (define-public neovim
("unibilium" ,unibilium)
("jemalloc" ,jemalloc)
("libiconv" ,libiconv)
- ("lua" ,lua-5.1)
+ ("lua" ,(if (member (or (%current-target-system)
+ (%current-system))
+ (package-supported-systems luajit))
+ luajit
+ lua-5.1))
("lua-luv" ,lua5.1-luv)
("lua-lpeg" ,lua5.1-lpeg)
("lua-bitop" ,lua5.1-bitop)
- ("lua-libmpack" ,lua5.1-libmpack)))
+ ("lua-libmpack" ,lua5.1-libmpack)
+ ("tree-sitter" ,tree-sitter)))
(native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter.
2022-02-01 13:04 ` [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
2022-02-01 13:04 ` [bug#53523] [PATCH v2 2/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
@ 2022-02-05 11:09 ` Maxime Devos
2022-02-05 18:17 ` Luis Henrique Gomes Higino
2022-02-05 11:11 ` Maxime Devos
` (2 subsequent siblings)
4 siblings, 1 reply; 48+ messages in thread
From: Maxime Devos @ 2022-02-05 11:09 UTC (permalink / raw)
To: Luis Henrique Gomes Higino, 53523
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
Luis Henrique Gomes Higino schreef op di 01-02-2022 om 10:04 [-0300]:
> + (add-after 'unpack 'fix-hardcoded-paths
> + (lambda _
> + (substitute* "Makefile"
> + (("/usr/local") (assoc-ref %outputs "out"))))))
%outputs and friends are being phased out, use G-exps instead:
(list #:phases
#~(modify-phases ...
(add-after 'unpack ...
(lambda _
(substitute* "Makefile"
(("/usr/local") #$output))))
[...])
[...])
> + #:tests? #f
Why are they disabled?
> + #:make-flags
> + (list (string-append "prefix="
> + (assoc-ref %outputs "out"))
Likewise (G-exps).
> + (string-append "CC="
> + ,(cc-for-target)))))
If G-exps are used, ',' needs to be replaced by #$.
Greetings,
Maxime.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter.
2022-02-01 13:04 ` [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
2022-02-01 13:04 ` [bug#53523] [PATCH v2 2/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
2022-02-05 11:09 ` [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter Maxime Devos
@ 2022-02-05 11:11 ` Maxime Devos
2022-02-05 18:23 ` Luis Henrique Gomes Higino
2022-02-05 11:12 ` Maxime Devos
2022-02-05 11:14 ` Maxime Devos
4 siblings, 1 reply; 48+ messages in thread
From: Maxime Devos @ 2022-02-05 11:11 UTC (permalink / raw)
To: Luis Henrique Gomes Higino, 53523
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
Luis Henrique Gomes Higino schreef op di 01-02-2022 om 10:04 [-0300]:
> + (substitute* "Makefile"
> + (("/usr/local") (assoc-ref %outputs "out"))))))
Is this necessary? The Makefile does 'PREFIX ?= /usr/local', so it
would seem to me that overriding PREFIX by setting #:make-flags
appropriately should be sufficient.
Greetings,
Maxime.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter.
2022-02-05 11:11 ` Maxime Devos
@ 2022-02-05 18:23 ` Luis Henrique Gomes Higino
0 siblings, 0 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-02-05 18:23 UTC (permalink / raw)
To: Maxime Devos; +Cc: 53523
Maxime Devos <maximedevos@telenet.be> writes:
> Luis Henrique Gomes Higino schreef op di 01-02-2022 om 10:04
> [-0300]:
>> + (substitute* "Makefile"
>> + (("/usr/local") (assoc-ref %outputs
>> "out"))))))
>
> Is this necessary? The Makefile does 'PREFIX ?= /usr/local', so
> it
> would seem to me that overriding PREFIX by setting #:make-flags
> appropriately should be sufficient.
>
You're right, I was using "prefix" on #:make-flags when it should
be "PREFIX", thanks for pointing it out!
--
Luis H. Higino
^ permalink raw reply [flat|nested] 48+ messages in thread
* [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter.
2022-02-01 13:04 ` [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (2 preceding siblings ...)
2022-02-05 11:11 ` Maxime Devos
@ 2022-02-05 11:12 ` Maxime Devos
2022-02-05 19:36 ` Luis Henrique Gomes Higino
2022-02-05 11:14 ` Maxime Devos
4 siblings, 1 reply; 48+ messages in thread
From: Maxime Devos @ 2022-02-05 11:12 UTC (permalink / raw)
To: Luis Henrique Gomes Higino, 53523
[-- Attachment #1: Type: text/plain, Size: 454 bytes --]
Luis Henrique Gomes Higino schreef op di 01-02-2022 om 10:04 [-0300]:
> + (uri (git-reference
> + (url "https://github.com/tree-sitter/tree-sitter")
> + (commit (string-append "v" version))))
tree-sitter is bundling some parts of ICU
(https://github.com/tree-sitter/tree-sitter/tree/master/lib/src/unicode),
can they be unbundled?
Greetings,
Maxime.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter.
2022-02-01 13:04 ` [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (3 preceding siblings ...)
2022-02-05 11:12 ` Maxime Devos
@ 2022-02-05 11:14 ` Maxime Devos
4 siblings, 0 replies; 48+ messages in thread
From: Maxime Devos @ 2022-02-05 11:14 UTC (permalink / raw)
To: Luis Henrique Gomes Higino, 53523
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
Luis Henrique Gomes Higino schreef op di 01-02-2022 om 10:04 [-0300]:
> + (list (string-append "prefix="
> + (assoc-ref %outputs "out"))
The Makefile has a 'PREFIX' variable, not a 'prefix' variable,
so this doesn't seem to have any effect?
Greetings,
Maxime
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread
* [bug#53523] About luajit supported platforms
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (3 preceding siblings ...)
2022-02-01 13:04 ` [bug#53523] [PATCH v2 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
@ 2022-02-05 19:41 ` Luis Henrique Gomes Higino
2022-03-14 2:30 ` [bug#53523] [PATCH]%20gnu:%20Add%20tree-sitter li zongyuan
` (10 subsequent siblings)
15 siblings, 0 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-02-05 19:41 UTC (permalink / raw)
To: 53523
I was doing some tests today with the Guile REPL and it seems like
luajit has been ported to more platforms recently. From my
impression, it seems like now there's no need to fallback to Lua
5.1 on any system. Running `(eq? (package-supported-systems
luajit) (package-supported-systems lua))` returns `#t`. Can anyone
confirm this?
--
Luis H. Higino
^ permalink raw reply [flat|nested] 48+ messages in thread* [bug#53523] [PATCH]%20gnu:%20Add%20tree-sitter.
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (4 preceding siblings ...)
2022-02-05 19:41 ` [bug#53523] About luajit supported platforms Luis Henrique Gomes Higino
@ 2022-03-14 2:30 ` li zongyuan
2022-03-14 3:35 ` [bug#53523] About luajit supported platforms li zongyuan
` (9 subsequent siblings)
15 siblings, 0 replies; 48+ messages in thread
From: li zongyuan @ 2022-03-14 2:30 UTC (permalink / raw)
To: 53523
[-- Attachment #1: Type: text/plain, Size: 432 bytes --]
Any further working on this patch, or if any help is still needed? I'm very
excited to have neovim 0.6.1 in guix!
I did some research on source code of lua package. From
https://github.com/guix-mirror/guix/blob/f9c62b23cc88541756656b3ec602ce987828d906/gnu/packages/lua.scm#L179
we can find that luajit deleted "powerpc64le-linux" from the supported
system list, which lua package didn't. So I think we should keep that
fallback.
[-- Attachment #2: Type: text/html, Size: 674 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread* [bug#53523] About luajit supported platforms
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (5 preceding siblings ...)
2022-03-14 2:30 ` [bug#53523] [PATCH]%20gnu:%20Add%20tree-sitter li zongyuan
@ 2022-03-14 3:35 ` li zongyuan
2022-03-14 17:03 ` Luis Henrique Gomes Higino
2022-03-14 23:31 ` [bug#53523] [PATCH v3 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (8 subsequent siblings)
15 siblings, 1 reply; 48+ messages in thread
From: li zongyuan @ 2022-03-14 3:35 UTC (permalink / raw)
To: luishenriquegh2701, 53523
[-- Attachment #1: Type: text/plain, Size: 358 bytes --]
I did some research on the source code of lua package. From
https://github.com/guix-mirror/guix/blob/f9c62b23cc88541756656b3ec602ce987828d906/gnu/packages/lua.scm#L179
we can find that luajit deleted "powerpc64le-linux" from the supported
system list, which lua package didn't. So I think we should keep that
fallback.
Hope this helps.
----
Zongyuan Li
[-- Attachment #2: Type: text/html, Size: 563 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v3 1/2] gnu: Add tree-sitter.
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (6 preceding siblings ...)
2022-03-14 3:35 ` [bug#53523] About luajit supported platforms li zongyuan
@ 2022-03-14 23:31 ` Luis Henrique Gomes Higino
2022-03-14 23:31 ` [bug#53523] [PATCH v3 2/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
2022-03-14 23:43 ` [bug#53523] [PATCH v3 1/2] gnu: Add tree-sitter Pierre Langlois
2022-03-16 3:07 ` [bug#53523] [PATCH v3 2/2] gnu: neovim: Update to 0.6.1 Zongyuan Li
` (7 subsequent siblings)
15 siblings, 2 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-03-14 23:31 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/text-editors.scm (tree-sitter): New variable.
---
gnu/packages/text-editors.scm | 54 +++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 2c5f5de719..d333d78e22 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2021 Calum Irwin <calumirwin1@gmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -39,6 +40,7 @@ (define-module (gnu packages text-editors)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix utils)
+ #:use-module (guix build utils)
#:use-module (guix build-system cargo)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
@@ -61,6 +63,7 @@ (define-module (gnu packages text-editors)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages haskell-xyz)
+ #:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libreoffice)
@@ -1165,3 +1168,54 @@ (define-public virtaal
provided by the Translate Toolkit, including XLIFF and PO.")
(home-page "https://virtaal.translatehouse.org/")
(license license:gpl2+)))
+
+(define-public tree-sitter
+ (package
+ (name "tree-sitter")
+ (version "0.20.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ ;; Remove bundled ICU parts
+ (delete-file-recursively "lib/src/unicode")
+ #t))))
+ (build-system gnu-build-system)
+ (inputs (list icu4c))
+ (arguments
+ (list #:phases
+ '(modify-phases %standard-phases
+ (delete 'configure))
+ #:tests? #f
+ #:make-flags
+ #~(list (string-append "PREFIX="
+ #$output)
+ (string-append "CC="
+ #$(cc-for-target)))))
+ (home-page "https://tree-sitter.github.io/tree-sitter/")
+ (synopsis "Incremental parsing system for programming tools")
+ (description
+ "Tree-sitter is a parser generator tool and an incremental parsing
+library. It can build a concrete syntax tree for a source file and efficiently
+update the syntax tree as the source file is edited.
+
+Tree-sitter aims to be:
+
+@itemize
+@item General enough to parse any programming language
+@item Fast enough to parse on every keystroke in a text editor
+@item Robust enough to provide useful results even in the presence of syntax errors
+@item Dependency-free so that the runtime library (which is written in pure C)
+can be embedded in any application
+@end itemize
+
+This package includes the @code{libtree-sitter} runtime library.
+")
+ (license license:expat)))
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v3 2/2] gnu: neovim: Update to 0.6.1.
2022-03-14 23:31 ` [bug#53523] [PATCH v3 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
@ 2022-03-14 23:31 ` Luis Henrique Gomes Higino
2022-03-14 23:43 ` [bug#53523] [PATCH v3 1/2] gnu: Add tree-sitter Pierre Langlois
1 sibling, 0 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-03-14 23:31 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim): Update to 0.6.1.
Build neovim with LuaJIT in the supported platforms.
---
gnu/packages/vim.scm | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index d5667851a8..10fb20a5e7 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Tissevert <tissevert+guix@marvid.fr>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -661,7 +662,7 @@ (define-public neovim-syntastic
(define-public neovim
(package
(name "neovim")
- (version "0.4.4")
+ (version "0.6.1")
(source
(origin
(method git-fetch)
@@ -670,13 +671,20 @@ (define-public neovim
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"))))
+ (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((srfi srfi-26)
(guix build cmake-build-system)
(guix build utils))
- #:configure-flags '("-DPREFER_LUA:BOOL=YES")
+ #:configure-flags
+ (list ,@(if (member (or (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ #f)
+ (%current-system))
+ (package-supported-systems luajit))
+ '()
+ '("-DPREFER_LUA:BOOL=YES")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-lua-paths
@@ -717,11 +725,18 @@ (define-public neovim
("unibilium" ,unibilium)
("jemalloc" ,jemalloc)
("libiconv" ,libiconv)
- ("lua" ,lua-5.1)
+ ("lua" ,(if (member (or (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ #f)
+ (%current-system))
+ (package-supported-systems luajit))
+ luajit
+ lua-5.1))
("lua-luv" ,lua5.1-luv)
("lua-lpeg" ,lua5.1-lpeg)
("lua-bitop" ,lua5.1-bitop)
- ("lua-libmpack" ,lua5.1-libmpack)))
+ ("lua-libmpack" ,lua5.1-libmpack)
+ ("tree-sitter" ,tree-sitter)))
(native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v3 1/2] gnu: Add tree-sitter.
2022-03-14 23:31 ` [bug#53523] [PATCH v3 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
2022-03-14 23:31 ` [bug#53523] [PATCH v3 2/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
@ 2022-03-14 23:43 ` Pierre Langlois
1 sibling, 0 replies; 48+ messages in thread
From: Pierre Langlois @ 2022-03-14 23:43 UTC (permalink / raw)
To: Luis Henrique Gomes Higino; +Cc: 53523
Hi Luis,
Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com> writes:
> * gnu/packages/text-editors.scm (tree-sitter): New variable.
I'm not a maintainer, but the patch looks good to me with just a minor
comment!
As mentioned before, I'll rebase on top of this after its merged, I
still have a bit more work to do on the emacs support for tree-sitter.
> ---
> gnu/packages/text-editors.scm | 54 +++++++++++++++++++++++++++++++++++
> 1 file changed, 54 insertions(+)
>
> diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
> index 2c5f5de719..d333d78e22 100644
> --- a/gnu/packages/text-editors.scm
> +++ b/gnu/packages/text-editors.scm
> @@ -17,6 +17,7 @@
> ;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
> ;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
> ;;; Copyright © 2021 Calum Irwin <calumirwin1@gmail.com>
> +;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -39,6 +40,7 @@ (define-module (gnu packages text-editors)
> #:use-module (guix gexp)
> #:use-module (guix git-download)
> #:use-module (guix utils)
> + #:use-module (guix build utils)
> #:use-module (guix build-system cargo)
> #:use-module (guix build-system cmake)
> #:use-module (guix build-system gnu)
> @@ -61,6 +63,7 @@ (define-module (gnu packages text-editors)
> #:use-module (gnu packages gtk)
> #:use-module (gnu packages guile)
> #:use-module (gnu packages haskell-xyz)
> + #:use-module (gnu packages icu4c)
> #:use-module (gnu packages image)
> #:use-module (gnu packages libbsd)
> #:use-module (gnu packages libreoffice)
> @@ -1165,3 +1168,54 @@ (define-public virtaal
> provided by the Translate Toolkit, including XLIFF and PO.")
> (home-page "https://virtaal.translatehouse.org/")
> (license license:gpl2+)))
> +
> +(define-public tree-sitter
> + (package
> + (name "tree-sitter")
> + (version "0.20.6")
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/tree-sitter/tree-sitter")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> + "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d"))
> + (modules '((guix build utils)))
> + (snippet '(begin
> + ;; Remove bundled ICU parts
> + (delete-file-recursively "lib/src/unicode")
> + #t))))
> + (build-system gnu-build-system)
> + (inputs (list icu4c))
> + (arguments
> + (list #:phases
> + '(modify-phases %standard-phases
> + (delete 'configure))
> + #:tests? #f
It might be nice to add a short comment to say that there are no tests
for the runtime library itself. A "; no check target." comment might
suffice, we do that often.
> + #:make-flags
> + #~(list (string-append "PREFIX="
> + #$output)
> + (string-append "CC="
> + #$(cc-for-target)))))
> + (home-page "https://tree-sitter.github.io/tree-sitter/")
> + (synopsis "Incremental parsing system for programming tools")
> + (description
> + "Tree-sitter is a parser generator tool and an incremental parsing
> +library. It can build a concrete syntax tree for a source file and efficiently
> +update the syntax tree as the source file is edited.
> +
> +Tree-sitter aims to be:
> +
> +@itemize
> +@item General enough to parse any programming language
> +@item Fast enough to parse on every keystroke in a text editor
> +@item Robust enough to provide useful results even in the presence of syntax errors
> +@item Dependency-free so that the runtime library (which is written in pure C)
> +can be embedded in any application
> +@end itemize
> +
> +This package includes the @code{libtree-sitter} runtime library.
> +")
> + (license license:expat)))
Thanks,
Pierre
^ permalink raw reply [flat|nested] 48+ messages in thread
* [bug#53523] [PATCH v3 2/2] gnu: neovim: Update to 0.6.1.
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (7 preceding siblings ...)
2022-03-14 23:31 ` [bug#53523] [PATCH v3 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
@ 2022-03-16 3:07 ` Zongyuan Li
2022-03-17 13:47 ` Luis Henrique Gomes Higino
2022-03-17 13:58 ` Luis Henrique Gomes Higino
2022-03-17 13:44 ` [bug#53523] [PATCH v4 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (6 subsequent siblings)
15 siblings, 2 replies; 48+ messages in thread
From: Zongyuan Li @ 2022-03-16 3:07 UTC (permalink / raw)
To: 53523; +Cc: luishenriquegh2701
Hi Luis,
I tried to apply `[PATCH v3 2/2] gnu: neovim: Update to 0.6.1.` to the
current main branch of Guix, but failed.
It seems like we import 'libiconv' which is not used as dependency in
previous neovim, from these code:
> @@ -717,11 +725,18 @@ (define-public neovim
> ("unibilium" ,unibilium)
> ("jemalloc" ,jemalloc)
> ("libiconv" ,libiconv)
> - ("lua" ,lua-5.1)
> + ("lua" ,(if (member (or (if (%current-target-system)
> + (gnu-triplet->nix-system
(%current-target-system))
> + #f)
> + (%current-system))
> + (package-supported-systems luajit))
> + luajit
> + lua-5.1))
> ("lua-luv" ,lua5.1-luv)
> ("lua-lpeg" ,lua5.1-lpeg)
> ("lua-bitop" ,lua5.1-bitop)
> - ("lua-libmpack" ,lua5.1-libmpack)))
> + ("lua-libmpack" ,lua5.1-libmpack)
> + ("tree-sitter" ,tree-sitter)))
Did you write this patch on any commit which is not included in the Guix
main branch?
Maybe we should rebase this patch set on main branch.
Li
^ permalink raw reply [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v4 1/2] gnu: Add tree-sitter.
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (8 preceding siblings ...)
2022-03-16 3:07 ` [bug#53523] [PATCH v3 2/2] gnu: neovim: Update to 0.6.1 Zongyuan Li
@ 2022-03-17 13:44 ` Luis Henrique Gomes Higino
2022-03-17 13:44 ` [bug#53523] [PATCH v4 2/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
2022-03-17 14:01 ` [bug#53523] [PATCH v5 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (5 subsequent siblings)
15 siblings, 1 reply; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-03-17 13:44 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/text-editors.scm (tree-sitter): New variable.
---
gnu/packages/text-editors.scm | 54 +++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 45cc61765a..d6ec000dc6 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2021 Calum Irwin <calumirwin1@gmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -39,6 +40,7 @@ (define-module (gnu packages text-editors)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix utils)
+ #:use-module (guix build utils)
#:use-module (guix build-system cargo)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
@@ -62,6 +64,7 @@ (define-module (gnu packages text-editors)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages haskell-xyz)
+ #:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libreoffice)
@@ -1165,3 +1168,54 @@ (define-public virtaal
provided by the Translate Toolkit, including XLIFF and PO.")
(home-page "https://virtaal.translatehouse.org/")
(license license:gpl2+)))
+
+(define-public tree-sitter
+ (package
+ (name "tree-sitter")
+ (version "0.20.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ ;; Remove bundled ICU parts
+ (delete-file-recursively "lib/src/unicode")
+ #t))))
+ (build-system gnu-build-system)
+ (inputs (list icu4c))
+ (arguments
+ (list #:phases
+ '(modify-phases %standard-phases
+ (delete 'configure))
+ #:tests? #f ; there are no tests for the runtime library
+ #:make-flags
+ #~(list (string-append "PREFIX="
+ #$output)
+ (string-append "CC="
+ #$(cc-for-target)))))
+ (home-page "https://tree-sitter.github.io/tree-sitter/")
+ (synopsis "Incremental parsing system for programming tools")
+ (description
+ "Tree-sitter is a parser generator tool and an incremental parsing
+library. It can build a concrete syntax tree for a source file and efficiently
+update the syntax tree as the source file is edited.
+
+Tree-sitter aims to be:
+
+@itemize
+@item General enough to parse any programming language
+@item Fast enough to parse on every keystroke in a text editor
+@item Robust enough to provide useful results even in the presence of syntax errors
+@item Dependency-free so that the runtime library (which is written in pure C)
+can be embedded in any application
+@end itemize
+
+This package includes the @code{libtree-sitter} runtime library.
+")
+ (license license:expat)))
base-commit: bae2201a8ddf789dff3f625327f5b2d0a686bc77
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v4 2/2] gnu: neovim: Update to 0.6.1.
2022-03-17 13:44 ` [bug#53523] [PATCH v4 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
@ 2022-03-17 13:44 ` Luis Henrique Gomes Higino
2022-03-17 17:29 ` Maxime Devos
0 siblings, 1 reply; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-03-17 13:44 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim): Update to 0.6.1.
Build neovim with LuaJIT in the supported platforms.
---
gnu/packages/vim.scm | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 28944dd640..1d5904935f 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Tissevert <tissevert+guix@marvid.fr>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -661,7 +662,7 @@ (define-public neovim-syntastic
(define-public neovim
(package
(name "neovim")
- (version "0.4.4")
+ (version "0.6.1")
(source
(origin
(method git-fetch)
@@ -670,13 +671,20 @@ (define-public neovim
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"))))
+ (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((srfi srfi-26)
(guix build cmake-build-system)
(guix build utils))
- #:configure-flags '("-DPREFER_LUA:BOOL=YES")
+ #:configure-flags
+ (list ,@(if (member (or (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ #f)
+ (%current-system))
+ (package-supported-systems luajit))
+ '()
+ '("-DPREFER_LUA:BOOL=YES")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-lua-paths
@@ -716,11 +724,19 @@ (define-public neovim
("libvterm" ,libvterm)
("unibilium" ,unibilium)
("jemalloc" ,jemalloc)
- ("lua" ,lua-5.1)
+ ("libiconv" ,libiconv)
+ ("lua" ,(if (member (or (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ #f)
+ (%current-system))
+ (package-supported-systems luajit))
+ luajit
+ lua-5.1))
("lua-luv" ,lua5.1-luv)
("lua-lpeg" ,lua5.1-lpeg)
("lua-bitop" ,lua5.1-bitop)
- ("lua-libmpack" ,lua5.1-libmpack)))
+ ("lua-libmpack" ,lua5.1-libmpack)
+ ("tree-sitter" ,tree-sitter)))
(native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [bug#53523] [PATCH v5 1/2] gnu: Add tree-sitter.
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (9 preceding siblings ...)
2022-03-17 13:44 ` [bug#53523] [PATCH v4 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
@ 2022-03-17 14:01 ` Luis Henrique Gomes Higino
2022-03-17 14:01 ` [bug#53523] [PATCH v5 2/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
2022-03-17 22:27 ` [bug#53523] [PATCH v6 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (4 subsequent siblings)
15 siblings, 1 reply; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-03-17 14:01 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/text-editors.scm (tree-sitter): New variable.
---
gnu/packages/text-editors.scm | 54 +++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 45cc61765a..d6ec000dc6 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2021 Calum Irwin <calumirwin1@gmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -39,6 +40,7 @@ (define-module (gnu packages text-editors)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix utils)
+ #:use-module (guix build utils)
#:use-module (guix build-system cargo)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
@@ -62,6 +64,7 @@ (define-module (gnu packages text-editors)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages haskell-xyz)
+ #:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libreoffice)
@@ -1165,3 +1168,54 @@ (define-public virtaal
provided by the Translate Toolkit, including XLIFF and PO.")
(home-page "https://virtaal.translatehouse.org/")
(license license:gpl2+)))
+
+(define-public tree-sitter
+ (package
+ (name "tree-sitter")
+ (version "0.20.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ ;; Remove bundled ICU parts
+ (delete-file-recursively "lib/src/unicode")
+ #t))))
+ (build-system gnu-build-system)
+ (inputs (list icu4c))
+ (arguments
+ (list #:phases
+ '(modify-phases %standard-phases
+ (delete 'configure))
+ #:tests? #f ; there are no tests for the runtime library
+ #:make-flags
+ #~(list (string-append "PREFIX="
+ #$output)
+ (string-append "CC="
+ #$(cc-for-target)))))
+ (home-page "https://tree-sitter.github.io/tree-sitter/")
+ (synopsis "Incremental parsing system for programming tools")
+ (description
+ "Tree-sitter is a parser generator tool and an incremental parsing
+library. It can build a concrete syntax tree for a source file and efficiently
+update the syntax tree as the source file is edited.
+
+Tree-sitter aims to be:
+
+@itemize
+@item General enough to parse any programming language
+@item Fast enough to parse on every keystroke in a text editor
+@item Robust enough to provide useful results even in the presence of syntax errors
+@item Dependency-free so that the runtime library (which is written in pure C)
+can be embedded in any application
+@end itemize
+
+This package includes the @code{libtree-sitter} runtime library.
+")
+ (license license:expat)))
base-commit: bae2201a8ddf789dff3f625327f5b2d0a686bc77
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v5 2/2] gnu: neovim: Update to 0.6.1.
2022-03-17 14:01 ` [bug#53523] [PATCH v5 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
@ 2022-03-17 14:01 ` Luis Henrique Gomes Higino
0 siblings, 0 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-03-17 14:01 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim): Update to 0.6.1.
Build neovim with LuaJIT in the supported platforms.
---
gnu/packages/vim.scm | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 28944dd640..62c0bc2b5c 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Tissevert <tissevert+guix@marvid.fr>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -661,7 +662,7 @@ (define-public neovim-syntastic
(define-public neovim
(package
(name "neovim")
- (version "0.4.4")
+ (version "0.6.1")
(source
(origin
(method git-fetch)
@@ -670,13 +671,20 @@ (define-public neovim
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"))))
+ (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((srfi srfi-26)
(guix build cmake-build-system)
(guix build utils))
- #:configure-flags '("-DPREFER_LUA:BOOL=YES")
+ #:configure-flags
+ (list ,@(if (member (or (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ #f)
+ (%current-system))
+ (package-supported-systems luajit))
+ '()
+ '("-DPREFER_LUA:BOOL=YES")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-lua-paths
@@ -716,11 +724,18 @@ (define-public neovim
("libvterm" ,libvterm)
("unibilium" ,unibilium)
("jemalloc" ,jemalloc)
- ("lua" ,lua-5.1)
+ ("lua" ,(if (member (or (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ #f)
+ (%current-system))
+ (package-supported-systems luajit))
+ luajit
+ lua-5.1))
("lua-luv" ,lua5.1-luv)
("lua-lpeg" ,lua5.1-lpeg)
("lua-bitop" ,lua5.1-bitop)
- ("lua-libmpack" ,lua5.1-libmpack)))
+ ("lua-libmpack" ,lua5.1-libmpack)
+ ("tree-sitter" ,tree-sitter)))
(native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [bug#53523] [PATCH v6 1/2] gnu: Add tree-sitter.
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (10 preceding siblings ...)
2022-03-17 14:01 ` [bug#53523] [PATCH v5 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
@ 2022-03-17 22:27 ` Luis Henrique Gomes Higino
2022-03-17 22:27 ` [bug#53523] [PATCH v6 2/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
2022-03-17 23:04 ` [bug#53523] [PATCH v7 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (3 subsequent siblings)
15 siblings, 1 reply; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-03-17 22:27 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/text-editors.scm (tree-sitter): New variable.
---
gnu/packages/text-editors.scm | 54 +++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 45cc61765a..d6ec000dc6 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2021 Calum Irwin <calumirwin1@gmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -39,6 +40,7 @@ (define-module (gnu packages text-editors)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix utils)
+ #:use-module (guix build utils)
#:use-module (guix build-system cargo)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
@@ -62,6 +64,7 @@ (define-module (gnu packages text-editors)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages haskell-xyz)
+ #:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libreoffice)
@@ -1165,3 +1168,54 @@ (define-public virtaal
provided by the Translate Toolkit, including XLIFF and PO.")
(home-page "https://virtaal.translatehouse.org/")
(license license:gpl2+)))
+
+(define-public tree-sitter
+ (package
+ (name "tree-sitter")
+ (version "0.20.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ ;; Remove bundled ICU parts
+ (delete-file-recursively "lib/src/unicode")
+ #t))))
+ (build-system gnu-build-system)
+ (inputs (list icu4c))
+ (arguments
+ (list #:phases
+ '(modify-phases %standard-phases
+ (delete 'configure))
+ #:tests? #f ; there are no tests for the runtime library
+ #:make-flags
+ #~(list (string-append "PREFIX="
+ #$output)
+ (string-append "CC="
+ #$(cc-for-target)))))
+ (home-page "https://tree-sitter.github.io/tree-sitter/")
+ (synopsis "Incremental parsing system for programming tools")
+ (description
+ "Tree-sitter is a parser generator tool and an incremental parsing
+library. It can build a concrete syntax tree for a source file and efficiently
+update the syntax tree as the source file is edited.
+
+Tree-sitter aims to be:
+
+@itemize
+@item General enough to parse any programming language
+@item Fast enough to parse on every keystroke in a text editor
+@item Robust enough to provide useful results even in the presence of syntax errors
+@item Dependency-free so that the runtime library (which is written in pure C)
+can be embedded in any application
+@end itemize
+
+This package includes the @code{libtree-sitter} runtime library.
+")
+ (license license:expat)))
base-commit: bae2201a8ddf789dff3f625327f5b2d0a686bc77
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v6 2/2] gnu: neovim: Update to 0.6.1.
2022-03-17 22:27 ` [bug#53523] [PATCH v6 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
@ 2022-03-17 22:27 ` Luis Henrique Gomes Higino
0 siblings, 0 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-03-17 22:27 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim): Update to 0.6.1.
Build neovim with LuaJIT in the supported platforms.
---
gnu/packages/vim.scm | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 28944dd640..e7f4464429 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Tissevert <tissevert+guix@marvid.fr>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -661,7 +662,7 @@ (define-public neovim-syntastic
(define-public neovim
(package
(name "neovim")
- (version "0.4.4")
+ (version "0.6.1")
(source
(origin
(method git-fetch)
@@ -670,13 +671,20 @@ (define-public neovim
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"))))
+ (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((srfi srfi-26)
(guix build cmake-build-system)
(guix build utils))
- #:configure-flags '("-DPREFER_LUA:BOOL=YES")
+ #:configure-flags
+ (list ,@(if (member (or (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ #f)
+ (%current-system))
+ (package-supported-systems luajit))
+ '()
+ '("-DPREFER_LUA:BOOL=YES")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-lua-paths
@@ -716,11 +724,17 @@ (define-public neovim
("libvterm" ,libvterm)
("unibilium" ,unibilium)
("jemalloc" ,jemalloc)
- ("lua" ,lua-5.1)
+ ("lua" ,(if (member (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ (%current-system))
+ (package-supported-systems luajit))
+ luajit
+ lua-5.1))
("lua-luv" ,lua5.1-luv)
("lua-lpeg" ,lua5.1-lpeg)
("lua-bitop" ,lua5.1-bitop)
- ("lua-libmpack" ,lua5.1-libmpack)))
+ ("lua-libmpack" ,lua5.1-libmpack)
+ ("tree-sitter" ,tree-sitter)))
(native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [bug#53523] [PATCH v7 1/2] gnu: Add tree-sitter.
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (11 preceding siblings ...)
2022-03-17 22:27 ` [bug#53523] [PATCH v6 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
@ 2022-03-17 23:04 ` Luis Henrique Gomes Higino
2022-03-17 23:04 ` [bug#53523] [PATCH v7 2/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
2022-03-25 12:49 ` [bug#53523] [PATCH v7 1/2] gnu: Add tree-sitter Pierre Langlois
2022-03-18 3:50 ` [bug#53523] [PATCH v7 2/2] gnu: neovim: Update to 0.6.1 li zongyuan
` (2 subsequent siblings)
15 siblings, 2 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-03-17 23:04 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/text-editors.scm (tree-sitter): New variable.
---
gnu/packages/text-editors.scm | 54 +++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 45cc61765a..d6ec000dc6 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2021 Calum Irwin <calumirwin1@gmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -39,6 +40,7 @@ (define-module (gnu packages text-editors)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix utils)
+ #:use-module (guix build utils)
#:use-module (guix build-system cargo)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
@@ -62,6 +64,7 @@ (define-module (gnu packages text-editors)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages haskell-xyz)
+ #:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libreoffice)
@@ -1165,3 +1168,54 @@ (define-public virtaal
provided by the Translate Toolkit, including XLIFF and PO.")
(home-page "https://virtaal.translatehouse.org/")
(license license:gpl2+)))
+
+(define-public tree-sitter
+ (package
+ (name "tree-sitter")
+ (version "0.20.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ ;; Remove bundled ICU parts
+ (delete-file-recursively "lib/src/unicode")
+ #t))))
+ (build-system gnu-build-system)
+ (inputs (list icu4c))
+ (arguments
+ (list #:phases
+ '(modify-phases %standard-phases
+ (delete 'configure))
+ #:tests? #f ; there are no tests for the runtime library
+ #:make-flags
+ #~(list (string-append "PREFIX="
+ #$output)
+ (string-append "CC="
+ #$(cc-for-target)))))
+ (home-page "https://tree-sitter.github.io/tree-sitter/")
+ (synopsis "Incremental parsing system for programming tools")
+ (description
+ "Tree-sitter is a parser generator tool and an incremental parsing
+library. It can build a concrete syntax tree for a source file and efficiently
+update the syntax tree as the source file is edited.
+
+Tree-sitter aims to be:
+
+@itemize
+@item General enough to parse any programming language
+@item Fast enough to parse on every keystroke in a text editor
+@item Robust enough to provide useful results even in the presence of syntax errors
+@item Dependency-free so that the runtime library (which is written in pure C)
+can be embedded in any application
+@end itemize
+
+This package includes the @code{libtree-sitter} runtime library.
+")
+ (license license:expat)))
base-commit: bae2201a8ddf789dff3f625327f5b2d0a686bc77
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v7 2/2] gnu: neovim: Update to 0.6.1.
2022-03-17 23:04 ` [bug#53523] [PATCH v7 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
@ 2022-03-17 23:04 ` Luis Henrique Gomes Higino
2022-03-25 12:49 ` [bug#53523] [PATCH v7 1/2] gnu: Add tree-sitter Pierre Langlois
1 sibling, 0 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-03-17 23:04 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim): Update to 0.6.1.
Build neovim with LuaJIT in the supported platforms.
---
gnu/packages/vim.scm | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 28944dd640..5a417cb456 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Tissevert <tissevert+guix@marvid.fr>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -661,7 +662,7 @@ (define-public neovim-syntastic
(define-public neovim
(package
(name "neovim")
- (version "0.4.4")
+ (version "0.6.1")
(source
(origin
(method git-fetch)
@@ -670,13 +671,19 @@ (define-public neovim
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"))))
+ (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((srfi srfi-26)
(guix build cmake-build-system)
(guix build utils))
- #:configure-flags '("-DPREFER_LUA:BOOL=YES")
+ #:configure-flags
+ (list ,@(if (member (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ (%current-system))
+ (package-supported-systems luajit))
+ '()
+ '("-DPREFER_LUA:BOOL=YES")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-lua-paths
@@ -716,11 +723,17 @@ (define-public neovim
("libvterm" ,libvterm)
("unibilium" ,unibilium)
("jemalloc" ,jemalloc)
- ("lua" ,lua-5.1)
+ ("lua" ,(if (member (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ (%current-system))
+ (package-supported-systems luajit))
+ luajit
+ lua-5.1))
("lua-luv" ,lua5.1-luv)
("lua-lpeg" ,lua5.1-lpeg)
("lua-bitop" ,lua5.1-bitop)
- ("lua-libmpack" ,lua5.1-libmpack)))
+ ("lua-libmpack" ,lua5.1-libmpack)
+ ("tree-sitter" ,tree-sitter)))
(native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v7 1/2] gnu: Add tree-sitter.
2022-03-17 23:04 ` [bug#53523] [PATCH v7 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
2022-03-17 23:04 ` [bug#53523] [PATCH v7 2/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
@ 2022-03-25 12:49 ` Pierre Langlois
2022-03-27 22:25 ` Luis Henrique Gomes Higino
1 sibling, 1 reply; 48+ messages in thread
From: Pierre Langlois @ 2022-03-25 12:49 UTC (permalink / raw)
To: Luis Henrique Gomes Higino; +Cc: 53523
[-- Attachment #1: Type: text/plain, Size: 1693 bytes --]
Hi!
> * gnu/packages/text-editors.scm (tree-sitter): New variable.
I applied the patch locally and tested it, just one small nit otherwise
LGTM.
Tested-by: Pierre Langlois <pierre.langlois@gmx.com>
Reviewed-by: Pierre Langlois <pierre.langlois@gmx.com>
Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com> writes:
> ---
> gnu/packages/text-editors.scm | 54 +++++++++++++++++++++++++++++++++++
> 1 file changed, 54 insertions(+)
>
> diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
> index 45cc61765a..d6ec000dc6 100644
> --- a/gnu/packages/text-editors.scm
> +++ b/gnu/packages/text-editors.scm
> @@ -17,6 +17,7 @@
> ;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
> ;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
> ;;; Copyright © 2021 Calum Irwin <calumirwin1@gmail.com>
> +;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -39,6 +40,7 @@ (define-module (gnu packages text-editors)
> #:use-module (guix gexp)
> #:use-module (guix git-download)
> #:use-module (guix utils)
> + #:use-module (guix build utils)
I don't think you need this import right? You'll have probably noticed
a warning:
WARNING: (gnu packages text-editors): `which' imported from both (guix build utils) and (gnu packages base)
When this happens we can resolve the conflict with a prefix, so we can
have the `which' procedure and the `base::which' package.
#:use-module ((gnu packages base) #:prefix base:)
In this case though we just don't need the import at all though I think.
Thanks!
Pierre
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 519 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread
* [bug#53523] [PATCH v7 1/2] gnu: Add tree-sitter.
2022-03-25 12:49 ` [bug#53523] [PATCH v7 1/2] gnu: Add tree-sitter Pierre Langlois
@ 2022-03-27 22:25 ` Luis Henrique Gomes Higino
0 siblings, 0 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-03-27 22:25 UTC (permalink / raw)
To: Pierre Langlois; +Cc: 53523
Pierre Langlois <pierre.langlois@gmx.com> writes:
> In this case though we just don't need the import at all though
> I think.
You are right. I thought it was necessary to import a module
externally to be able to use it on an origin snippet, through the
`modules` field. However, after reading the guix manual with more
attention, I understood it is not. Just to be sure, I tested
building tree-sitter without this import and it was
successful. I'll be sending the new patch series in a minute.
Regards,
--
Luis H. Higino
^ permalink raw reply [flat|nested] 48+ messages in thread
* [bug#53523] [PATCH v7 2/2] gnu: neovim: Update to 0.6.1.
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (12 preceding siblings ...)
2022-03-17 23:04 ` [bug#53523] [PATCH v7 1/2] gnu: Add tree-sitter Luis Henrique Gomes Higino
@ 2022-03-18 3:50 ` li zongyuan
2022-03-19 18:38 ` Luis Henrique Gomes Higino
2022-03-23 7:42 ` [bug#53523] [PATCH v7 1/2] gnu: Add tree-sitter li zongyuan
2022-03-27 22:31 ` [bug#53523] [PATCH v8 " Luis Henrique Gomes Higino
15 siblings, 1 reply; 48+ messages in thread
From: li zongyuan @ 2022-03-18 3:50 UTC (permalink / raw)
To: luishenriquegh2701; +Cc: 53523
Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com> writes:
> @@ -670,13 +671,19 @@ (define-public neovim
> (commit (string-append "v" version))))
> (file-name (git-file-name name version))
> (sha256
> - (base32 "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"))))
> + (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx"))))
> (build-system cmake-build-system)
> (arguments
> `(#:modules ((srfi srfi-26)
> (guix build cmake-build-system)
> (guix build utils))
> - #:configure-flags '("-DPREFER_LUA:BOOL=YES")
> + #:configure-flags
> + (list ,@(if (member (if (%current-target-system)
> + (gnu-triplet->nix-system (%current-target-system))
> + (%current-system))
> + (package-supported-systems luajit))
> + '()
> + '("-DPREFER_LUA:BOOL=YES")))
> #:phases
> (modify-phases %standard-phases
> (add-after 'unpack 'set-lua-paths
We can just remove `-DPREFER_LUA:BOOL` flags. Since we have a fallback
from luajit to lua,
this macro won't take any effect.
FYI, you can take a look about usage of this macro from here:
https://github.com/neovim/neovim/blob/8ed9c84481a7d0df0708d11ffa538f832591240f/CMakeLists.txt#L431
BTW, I have tested this patch set on the x86_64 platform and it works
perfectly. Maybe it's time to involve committers for reviewing this
patch.
^ permalink raw reply [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v7 2/2] gnu: neovim: Update to 0.6.1.
2022-03-18 3:50 ` [bug#53523] [PATCH v7 2/2] gnu: neovim: Update to 0.6.1 li zongyuan
@ 2022-03-19 18:38 ` Luis Henrique Gomes Higino
0 siblings, 0 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-03-19 18:38 UTC (permalink / raw)
To: li zongyuan; +Cc: 53523
li zongyuan <lyzongyuan@gmail.com> writes:
> We can just remove `-DPREFER_LUA:BOOL` flags. Since we have a
> fallback
> from luajit to lua,
> this macro won't take any effect.
I tried building it on powerpc64le-linux, through `--system`,
without this flag and had this error:
--8<---------------cut here---------------start------------->8---
CMake Error at
/gnu/store/7vfcp65x5ys1a3jal9qys1davs2zk9rs-cmake-minimal-3.21.4/share/cmake-3.21/Modules/FindPackageHandleStandardArgs.cmake:230
(message):
Could NOT find LuaJit (missing: LUAJIT_LIBRARY
LUAJIT_INCLUDE_DIR)
Call Stack (most recent call first):
/gnu/store/7vfcp65x5ys1a3jal9qys1davs2zk9rs-cmake-minimal-3.21.4/share/cmake-3.21/Modules/FindPackageHandleStandardArgs.cmake:594
(_FPHSA_FAILURE_MESSAGE)
cmake/FindLuaJit.cmake:35 (find_package_handle_standard_args)
CMakeLists.txt:422 (find_package)
--8<---------------cut here---------------end--------------->8---
> BTW, I have tested this patch set on the x86_64 platform and it
> works
> perfectly. Maybe it's time to involve committers for reviewing
> this
> patch.
I agree! I sense it is really close to done.
Regards,
--
Luis H. Higino
^ permalink raw reply [flat|nested] 48+ messages in thread
* [bug#53523] [PATCH v7 1/2] gnu: Add tree-sitter.
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (13 preceding siblings ...)
2022-03-18 3:50 ` [bug#53523] [PATCH v7 2/2] gnu: neovim: Update to 0.6.1 li zongyuan
@ 2022-03-23 7:42 ` li zongyuan
2022-03-27 22:31 ` [bug#53523] [PATCH v8 " Luis Henrique Gomes Higino
15 siblings, 0 replies; 48+ messages in thread
From: li zongyuan @ 2022-03-23 7:42 UTC (permalink / raw)
To: 53523; +Cc: iyzsong
Hi Song,
Would you mind take a look about this patch?
This could be great for vim user if it can be applied.
Thanks,
Li
^ permalink raw reply [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v8 1/2] gnu: Add tree-sitter.
2022-01-25 14:33 [bug#53523] [PATCH] gnu: Add tree-sitter Luis Henrique Gomes Higino
` (14 preceding siblings ...)
2022-03-23 7:42 ` [bug#53523] [PATCH v7 1/2] gnu: Add tree-sitter li zongyuan
@ 2022-03-27 22:31 ` Luis Henrique Gomes Higino
2022-03-27 22:31 ` [bug#53523] [PATCH v8 2/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
2022-03-29 10:02 ` bug#53523: [PATCH] gnu: Add tree-sitter Ludovic Courtès
15 siblings, 2 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-03-27 22:31 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/text-editors.scm (tree-sitter): New variable.
---
gnu/packages/text-editors.scm | 53 +++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 45cc61765a..7cbad042c9 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2021 Calum Irwin <calumirwin1@gmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -62,6 +63,7 @@ (define-module (gnu packages text-editors)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages haskell-xyz)
+ #:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libreoffice)
@@ -1165,3 +1167,54 @@ (define-public virtaal
provided by the Translate Toolkit, including XLIFF and PO.")
(home-page "https://virtaal.translatehouse.org/")
(license license:gpl2+)))
+
+(define-public tree-sitter
+ (package
+ (name "tree-sitter")
+ (version "0.20.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tree-sitter/tree-sitter")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1z20518snyg0zp75qgs5bxmzjqws4dd19vnp6sya494za3qp5b6d"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ ;; Remove bundled ICU parts
+ (delete-file-recursively "lib/src/unicode")
+ #t))))
+ (build-system gnu-build-system)
+ (inputs (list icu4c))
+ (arguments
+ (list #:phases
+ '(modify-phases %standard-phases
+ (delete 'configure))
+ #:tests? #f ; there are no tests for the runtime library
+ #:make-flags
+ #~(list (string-append "PREFIX="
+ #$output)
+ (string-append "CC="
+ #$(cc-for-target)))))
+ (home-page "https://tree-sitter.github.io/tree-sitter/")
+ (synopsis "Incremental parsing system for programming tools")
+ (description
+ "Tree-sitter is a parser generator tool and an incremental parsing
+library. It can build a concrete syntax tree for a source file and efficiently
+update the syntax tree as the source file is edited.
+
+Tree-sitter aims to be:
+
+@itemize
+@item General enough to parse any programming language
+@item Fast enough to parse on every keystroke in a text editor
+@item Robust enough to provide useful results even in the presence of syntax errors
+@item Dependency-free so that the runtime library (which is written in pure C)
+can be embedded in any application
+@end itemize
+
+This package includes the @code{libtree-sitter} runtime library.
+")
+ (license license:expat)))
base-commit: 2344fb10972a4cefead8e7aa3e0b807da4cf4570
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [bug#53523] [PATCH v8 2/2] gnu: neovim: Update to 0.6.1.
2022-03-27 22:31 ` [bug#53523] [PATCH v8 " Luis Henrique Gomes Higino
@ 2022-03-27 22:31 ` Luis Henrique Gomes Higino
2022-03-29 10:02 ` bug#53523: [PATCH] gnu: Add tree-sitter Ludovic Courtès
1 sibling, 0 replies; 48+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-03-27 22:31 UTC (permalink / raw)
To: 53523; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim): Update to 0.6.1.
Build neovim with LuaJIT in the supported platforms.
---
gnu/packages/vim.scm | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index ef6c62cc69..bc5e36c6f2 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Tissevert <tissevert+guix@marvid.fr>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -662,7 +663,7 @@ (define-public neovim-syntastic
(define-public neovim
(package
(name "neovim")
- (version "0.4.4")
+ (version "0.6.1")
(source
(origin
(method git-fetch)
@@ -671,13 +672,19 @@ (define-public neovim
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"))))
+ (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((srfi srfi-26)
(guix build cmake-build-system)
(guix build utils))
- #:configure-flags '("-DPREFER_LUA:BOOL=YES")
+ #:configure-flags
+ (list ,@(if (member (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ (%current-system))
+ (package-supported-systems luajit))
+ '()
+ '("-DPREFER_LUA:BOOL=YES")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-lua-paths
@@ -717,11 +724,17 @@ (define-public neovim
("libvterm" ,libvterm)
("unibilium" ,unibilium)
("jemalloc" ,jemalloc)
- ("lua" ,lua-5.1)
+ ("lua" ,(if (member (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ (%current-system))
+ (package-supported-systems luajit))
+ luajit
+ lua-5.1))
("lua-luv" ,lua5.1-luv)
("lua-lpeg" ,lua5.1-lpeg)
("lua-bitop" ,lua5.1-bitop)
- ("lua-libmpack" ,lua5.1-libmpack)))
+ ("lua-libmpack" ,lua5.1-libmpack)
+ ("tree-sitter" ,tree-sitter)))
(native-inputs
`(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
--
2.34.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* bug#53523: [PATCH] gnu: Add tree-sitter.
2022-03-27 22:31 ` [bug#53523] [PATCH v8 " Luis Henrique Gomes Higino
2022-03-27 22:31 ` [bug#53523] [PATCH v8 2/2] gnu: neovim: Update to 0.6.1 Luis Henrique Gomes Higino
@ 2022-03-29 10:02 ` Ludovic Courtès
1 sibling, 0 replies; 48+ messages in thread
From: Ludovic Courtès @ 2022-03-29 10:02 UTC (permalink / raw)
To: Luis Henrique Gomes Higino; +Cc: 53523-done, Pierre Langlois
Hi Luis,
Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com> skribis:
> * gnu/packages/text-editors.scm (tree-sitter): New variable.
[...]
> * gnu/packages/vim.scm (neovim): Update to 0.6.1.
Applied.
Thank you and thanks everyone who commented!
Ludo’.
^ permalink raw reply [flat|nested] 48+ messages in thread