* [bug#54981] [PATCH 0/3] Update neovim to version 0.7.0
@ 2022-04-17 3:34 ` Imran Iqbal
2022-04-17 3:34 ` [bug#54982] [PATCH 1/3] gnu: libuv: Update to 1.43.0 Imran Iqbal
` (5 more replies)
0 siblings, 6 replies; 37+ messages in thread
From: Imran Iqbal @ 2022-04-17 3:34 UTC (permalink / raw)
To: 54981
Hi,
This set of patches brings neovim up to version 0.7.0. A change was
introduced:
https://github.com/neovim/neovim/commit/55ab76a1c0f63ebb735495a91066cbe01b6d0bb3
that bumps the required version lua-luv to 1.43.0-0, which subsequently
required libuv to bumped to 1.43.0 as well.
lua-compat-5.3 was bumped to e245d3a18957e43ef902a59a72c8902e2e4435b9
which moves the compat-5.3.h header file under a new c-api folder see:
https://github.com/luvit/luv/commit/60946d35ad6ba80d836e70174e0610ed32c3eb01
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#54982] [PATCH 1/3] gnu: libuv: Update to 1.43.0.
2022-04-17 3:34 ` [bug#54981] [PATCH 0/3] Update neovim to version 0.7.0 Imran Iqbal
@ 2022-04-17 3:34 ` Imran Iqbal
2022-04-17 5:18 ` bug#54982: Acknowledgement ([PATCH 1/3] gnu: libuv: Update to 1.43.0.) GNU bug Tracking System
2022-05-18 18:13 ` bug#54982: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0) GNU bug Tracking System
2022-04-17 3:34 ` [bug#54983] [PATCH 2/3] gnu: lua-luv: Update to 1.43.0-0 Imran Iqbal
` (4 subsequent siblings)
5 siblings, 2 replies; 37+ messages in thread
From: Imran Iqbal @ 2022-04-17 3:34 UTC (permalink / raw)
To: 54982; +Cc: Imran Iqbal
* gnu/packages/libevent.scm (libuv): Update to 1.43.0.
---
gnu/packages/libevent.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index b3a5cd915e..e5b05ed1b6 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -104,14 +104,14 @@ (define-public libev
(define-public libuv
(package
(name "libuv")
- (version "1.41.1")
+ (version "1.43.0")
(source (origin
(method url-fetch)
(uri (string-append "https://dist.libuv.org/dist/v" version
"/libuv-v" version ".tar.gz"))
(sha256
(base32
- "0zb818sjwnxn5yv3qvkxaprjf037yqmjipk5i3a8rg1q4izhrnv5"))))
+ "194kwq3jfj9s628kzkchdca534rikjw0xiyas0cjbphqmsvjpmwh"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-static")
--
2.35.3
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#54983] [PATCH 2/3] gnu: lua-luv: Update to 1.43.0-0.
2022-04-17 3:34 ` [bug#54981] [PATCH 0/3] Update neovim to version 0.7.0 Imran Iqbal
2022-04-17 3:34 ` [bug#54982] [PATCH 1/3] gnu: libuv: Update to 1.43.0 Imran Iqbal
@ 2022-04-17 3:34 ` Imran Iqbal
2022-04-17 5:18 ` bug#54983: Acknowledgement ([PATCH 2/3] gnu: lua-luv: Update to 1.43.0-0.) GNU bug Tracking System
2022-05-18 18:13 ` bug#54983: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0) GNU bug Tracking System
2022-04-17 3:34 ` [bug#54984] [PATCH 3/3] gnu: neovim: Update to 0.7.0 Imran Iqbal
` (3 subsequent siblings)
5 siblings, 2 replies; 37+ messages in thread
From: Imran Iqbal @ 2022-04-17 3:34 UTC (permalink / raw)
To: 54983; +Cc: Imran Iqbal
* gnu/packages/lua.scm (lua-luv): Update to 1.43.0-0.
---
gnu/packages/lua.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index ee4b7727e0..e91d04cbd0 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -785,7 +785,7 @@ (define-public lua5.2-lpeg
(define (make-lua-luv name lua)
(package
(name name)
- (version "1.32.0-0")
+ (version "1.43.0-0")
(source (origin
;; The release tarball includes the sources of libuv but does
;; not include the pkg-config files.
@@ -796,7 +796,7 @@ (define (make-lua-luv name lua)
(file-name (git-file-name name version))
(sha256
(base32
- "0c65c1lhbl0axnyks3910gjs0z0hw7w6jvl07g8kbpnbvfl4qajh"))))
+ "1yzi4bm845vl84wyv2qw4z1n1v285lgwm681swmp84brfy2s7czp"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are none
@@ -813,7 +813,7 @@ (define (make-lua-luv name lua)
(copy-recursively (assoc-ref inputs "lua-compat")
"lua-compat")
(setenv "CPATH"
- (string-append (getcwd) "/lua-compat:"
+ (string-append (getcwd) "/lua-compat/c-api:"
(or (getenv "CPATH") "")))
#t)))))
(inputs
@@ -824,11 +824,11 @@ (define (make-lua-luv name lua)
(method git-fetch)
(uri (git-reference
(url "https://github.com/keplerproject/lua-compat-5.3")
- (commit "daebe77a2f498817713df37f0bb316db1d82222f")))
+ (commit "e245d3a18957e43ef902a59a72c8902e2e4435b9")))
(file-name "lua-compat-5.3-checkout")
(sha256
(base32
- "02a14nvn7aggg1yikj9h3dcf8aqjbxlws1bfvqbpfxv9d5phnrpz"))))))
+ "1caxn228gx48g6kymp9w7kczgxcg0v0cd5ixsx8viybzkd60dcn4"))))))
(home-page "https://github.com/luvit/luv/")
(synopsis "Libuv bindings for Lua")
(description
--
2.35.3
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#54984] [PATCH 3/3] gnu: neovim: Update to 0.7.0.
2022-04-17 3:34 ` [bug#54981] [PATCH 0/3] Update neovim to version 0.7.0 Imran Iqbal
2022-04-17 3:34 ` [bug#54982] [PATCH 1/3] gnu: libuv: Update to 1.43.0 Imran Iqbal
2022-04-17 3:34 ` [bug#54983] [PATCH 2/3] gnu: lua-luv: Update to 1.43.0-0 Imran Iqbal
@ 2022-04-17 3:34 ` Imran Iqbal
2022-04-17 5:18 ` bug#54984: Acknowledgement ([PATCH 3/3] gnu: neovim: Update to 0.7.0.) GNU bug Tracking System
2022-05-18 18:13 ` bug#54984: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0) GNU bug Tracking System
2022-04-17 5:18 ` bug#54981: Acknowledgement ([PATCH 0/3] Update neovim to version 0.7.0) GNU bug Tracking System
` (2 subsequent siblings)
5 siblings, 2 replies; 37+ messages in thread
From: Imran Iqbal @ 2022-04-17 3:34 UTC (permalink / raw)
To: 54984; +Cc: Imran Iqbal
* gnu/packages/vim.scm (neovim): Update to 0.7.0.
---
gnu/packages/vim.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 7279798fe6..d04ee49775 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -668,7 +668,7 @@ (define-public neovim-syntastic
(define-public neovim
(package
(name "neovim")
- (version "0.6.1")
+ (version "0.7.0")
(source
(origin
(method git-fetch)
@@ -677,7 +677,7 @@ (define-public neovim
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx"))))
+ (base32 "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((srfi srfi-26)
--
2.35.3
^ permalink raw reply related [flat|nested] 37+ messages in thread
* bug#54981: Acknowledgement ([PATCH 0/3] Update neovim to version 0.7.0)
2022-04-17 3:34 ` [bug#54981] [PATCH 0/3] Update neovim to version 0.7.0 Imran Iqbal
` (2 preceding siblings ...)
2022-04-17 3:34 ` [bug#54984] [PATCH 3/3] gnu: neovim: Update to 0.7.0 Imran Iqbal
@ 2022-04-17 5:18 ` GNU bug Tracking System
2022-04-17 8:07 ` [bug#54981] [PATCH 0/3] Update neovim to version 0.7.0 Maxime Devos
2022-05-18 18:13 ` bug#54981: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0) GNU bug Tracking System
5 siblings, 0 replies; 37+ messages in thread
From: GNU bug Tracking System @ 2022-04-17 5:18 UTC (permalink / raw)
To: guix-patches
Thank you for filing a new bug report with debbugs.gnu.org.
This is an automatically generated reply to let you know your message
has been received.
Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.
Your message has been sent to the package maintainer(s):
guix-patches@gnu.org
If you wish to submit further information on this problem, please
send it to 54981@debbugs.gnu.org.
Please do not send mail to help-debbugs@gnu.org unless you wish
to report a problem with the Bug-tracking system.
--
54981: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=54981
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
^ permalink raw reply [flat|nested] 37+ messages in thread
* bug#54982: Acknowledgement ([PATCH 1/3] gnu: libuv: Update to 1.43.0.)
2022-04-17 3:34 ` [bug#54982] [PATCH 1/3] gnu: libuv: Update to 1.43.0 Imran Iqbal
@ 2022-04-17 5:18 ` GNU bug Tracking System
2022-05-18 18:13 ` bug#54982: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0) GNU bug Tracking System
1 sibling, 0 replies; 37+ messages in thread
From: GNU bug Tracking System @ 2022-04-17 5:18 UTC (permalink / raw)
To: guix-patches
Thank you for filing a new bug report with debbugs.gnu.org.
This is an automatically generated reply to let you know your message
has been received.
Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.
Your message has been sent to the package maintainer(s):
guix-patches@gnu.org
If you wish to submit further information on this problem, please
send it to 54982@debbugs.gnu.org.
Please do not send mail to help-debbugs@gnu.org unless you wish
to report a problem with the Bug-tracking system.
--
54982: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=54982
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
^ permalink raw reply [flat|nested] 37+ messages in thread
* bug#54983: Acknowledgement ([PATCH 2/3] gnu: lua-luv: Update to 1.43.0-0.)
2022-04-17 3:34 ` [bug#54983] [PATCH 2/3] gnu: lua-luv: Update to 1.43.0-0 Imran Iqbal
@ 2022-04-17 5:18 ` GNU bug Tracking System
2022-05-18 18:13 ` bug#54983: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0) GNU bug Tracking System
1 sibling, 0 replies; 37+ messages in thread
From: GNU bug Tracking System @ 2022-04-17 5:18 UTC (permalink / raw)
To: guix-patches
Thank you for filing a new bug report with debbugs.gnu.org.
This is an automatically generated reply to let you know your message
has been received.
Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.
Your message has been sent to the package maintainer(s):
guix-patches@gnu.org
If you wish to submit further information on this problem, please
send it to 54983@debbugs.gnu.org.
Please do not send mail to help-debbugs@gnu.org unless you wish
to report a problem with the Bug-tracking system.
--
54983: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=54983
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
^ permalink raw reply [flat|nested] 37+ messages in thread
* bug#54984: Acknowledgement ([PATCH 3/3] gnu: neovim: Update to 0.7.0.)
2022-04-17 3:34 ` [bug#54984] [PATCH 3/3] gnu: neovim: Update to 0.7.0 Imran Iqbal
@ 2022-04-17 5:18 ` GNU bug Tracking System
2022-05-18 18:13 ` bug#54984: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0) GNU bug Tracking System
1 sibling, 0 replies; 37+ messages in thread
From: GNU bug Tracking System @ 2022-04-17 5:18 UTC (permalink / raw)
To: guix-patches
Thank you for filing a new bug report with debbugs.gnu.org.
This is an automatically generated reply to let you know your message
has been received.
Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.
Your message has been sent to the package maintainer(s):
guix-patches@gnu.org
If you wish to submit further information on this problem, please
send it to 54984@debbugs.gnu.org.
Please do not send mail to help-debbugs@gnu.org unless you wish
to report a problem with the Bug-tracking system.
--
54984: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=54984
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#54981] [PATCH 0/3] Update neovim to version 0.7.0
2022-04-17 3:34 ` [bug#54981] [PATCH 0/3] Update neovim to version 0.7.0 Imran Iqbal
` (3 preceding siblings ...)
2022-04-17 5:18 ` bug#54981: Acknowledgement ([PATCH 0/3] Update neovim to version 0.7.0) GNU bug Tracking System
@ 2022-04-17 8:07 ` Maxime Devos
2022-05-18 18:13 ` bug#54981: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0) GNU bug Tracking System
5 siblings, 0 replies; 37+ messages in thread
From: Maxime Devos @ 2022-04-17 8:07 UTC (permalink / raw)
To: 54981; +Cc: control
[-- Attachment #1: Type: text/plain, Size: 810 bytes --]
merge 54981 54982 54983 54984
thanks
Hi, guix-patches@gnu.org is for submitting new patch series, not for
responding to existing patches, so in the future, please don't put
guix-patches@gnu.org in Reply-To or CC and only send a single mail to
guix-patches@gnu.org, send the later ones to the NNNNN@debbugs.gnu.org,
such that only a single entry is created and the patches aren't lost.
‘(guix)Configuring Git’ has some info on this matter:
When sending a patch series (e.g., using ‘git send-email’), please
first send one message to <guix-patches@gnu.org>, and then send
subsequent patches to <NNN@debbugs.gnu.org> to make sure they are
kept together. See the Debbugs documentation
(https://debbugs.gnu.org/Advanced.html) for more information. [...]
Greetings,
Maxime.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH] update neovim to 0.7.0
@ 2022-04-20 17:46 Luis Henrique Gomes Higino
2022-04-20 17:52 ` [bug#55045] [PATCH 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
` (5 more replies)
0 siblings, 6 replies; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-04-20 17:46 UTC (permalink / raw)
To: 55045
Hi guix, this patch series updates lua-luv to 1.43.0-0 and neovim
to 0.7.0. Besides that, I took the opportunity to convert their
package definitions to Guix's new code style.
Regards,
--
Luis H. Higino
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH 1/4] gnu: lua-luv: Update to 1.43.0-0.
2022-04-20 17:46 [bug#55045] [PATCH] update neovim to 0.7.0 Luis Henrique Gomes Higino
@ 2022-04-20 17:52 ` Luis Henrique Gomes Higino
2022-04-20 17:52 ` [bug#55045] [PATCH 2/4] gnu: lua-luv: replace sexps with gexps Luis Henrique Gomes Higino
` (2 more replies)
2022-04-21 2:47 ` [bug#55045] [PATCH] update neovim to 0.7.0 Imran Iqbal
` (4 subsequent siblings)
5 siblings, 3 replies; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-04-20 17:52 UTC (permalink / raw)
To: 55045; +Cc: Luis Henrique Gomes Higino
* gnu/packages/lua.scm (lua-luv): Update to 1.43.0-0.
Update lua-compat-5.3.
---
gnu/packages/lua.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index ee4b7727e0..2f89d42ba5 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -16,6 +16,7 @@
;;; Copyright © 2021 Vinícius dos Santos Oliveira <vini.ipsmaker@gmail.com>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Brandon Lucas <br@ndon.dk>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -785,7 +786,7 @@ (define-public lua5.2-lpeg
(define (make-lua-luv name lua)
(package
(name name)
- (version "1.32.0-0")
+ (version "1.43.0-0")
(source (origin
;; The release tarball includes the sources of libuv but does
;; not include the pkg-config files.
@@ -796,7 +797,7 @@ (define (make-lua-luv name lua)
(file-name (git-file-name name version))
(sha256
(base32
- "0c65c1lhbl0axnyks3910gjs0z0hw7w6jvl07g8kbpnbvfl4qajh"))))
+ "1yzi4bm845vl84wyv2qw4z1n1v285lgwm681swmp84brfy2s7czp"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are none
@@ -813,7 +814,7 @@ (define (make-lua-luv name lua)
(copy-recursively (assoc-ref inputs "lua-compat")
"lua-compat")
(setenv "CPATH"
- (string-append (getcwd) "/lua-compat:"
+ (string-append (getcwd) "/lua-compat/c-api:"
(or (getenv "CPATH") "")))
#t)))))
(inputs
@@ -824,11 +825,11 @@ (define (make-lua-luv name lua)
(method git-fetch)
(uri (git-reference
(url "https://github.com/keplerproject/lua-compat-5.3")
- (commit "daebe77a2f498817713df37f0bb316db1d82222f")))
+ (commit "v0.10")))
(file-name "lua-compat-5.3-checkout")
(sha256
(base32
- "02a14nvn7aggg1yikj9h3dcf8aqjbxlws1bfvqbpfxv9d5phnrpz"))))))
+ "1caxn228gx48g6kymp9w7kczgxcg0v0cd5ixsx8viybzkd60dcn4"))))))
(home-page "https://github.com/luvit/luv/")
(synopsis "Libuv bindings for Lua")
(description
--
2.34.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH 2/4] gnu: lua-luv: replace sexps with gexps.
2022-04-20 17:52 ` [bug#55045] [PATCH 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
@ 2022-04-20 17:52 ` Luis Henrique Gomes Higino
2022-04-20 17:52 ` [bug#55045] [PATCH 3/4] gnu: neovim: Update to 0.7.0 Luis Henrique Gomes Higino
2022-04-20 17:52 ` [bug#55045] [PATCH 4/4] gnu: neovim: replace sexps with gexps Luis Henrique Gomes Higino
2 siblings, 0 replies; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-04-20 17:52 UTC (permalink / raw)
To: 55045; +Cc: Luis Henrique Gomes Higino
* gnu/packages/lua.scm (lua-luv): replace sexps with gexps.
---
gnu/packages/lua.scm | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 2f89d42ba5..ba101f0d6c 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -800,23 +800,23 @@ (define (make-lua-luv name lua)
"1yzi4bm845vl84wyv2qw4z1n1v285lgwm681swmp84brfy2s7czp"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; there are none
- #:configure-flags
- '("-DWITH_LUA_ENGINE=Lua"
- "-DWITH_SHARED_LIBUV=On"
- "-DBUILD_MODULE=Off"
- "-DBUILD_SHARED_LIBS=On"
- "-DLUA_BUILD_TYPE=System")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'copy-lua-compat
- (lambda* (#:key inputs #:allow-other-keys)
- (copy-recursively (assoc-ref inputs "lua-compat")
- "lua-compat")
- (setenv "CPATH"
- (string-append (getcwd) "/lua-compat/c-api:"
- (or (getenv "CPATH") "")))
- #t)))))
+ (list #:tests? #f ; there are none
+ #:configure-flags
+ #~'("-DWITH_LUA_ENGINE=Lua"
+ "-DWITH_SHARED_LIBUV=On"
+ "-DBUILD_MODULE=Off"
+ "-DBUILD_SHARED_LIBS=On"
+ "-DLUA_BUILD_TYPE=System")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'copy-lua-compat
+ (lambda* _
+ (copy-recursively #+(this-package-native-input "lua-compat")
+ "lua-compat")
+ (setenv "CPATH"
+ (string-append (getcwd) "/lua-compat/c-api:"
+ (or (getenv "CPATH") "")))
+ #t)))))
(inputs
(list lua libuv))
(native-inputs
--
2.34.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH 3/4] gnu: neovim: Update to 0.7.0.
2022-04-20 17:52 ` [bug#55045] [PATCH 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
2022-04-20 17:52 ` [bug#55045] [PATCH 2/4] gnu: lua-luv: replace sexps with gexps Luis Henrique Gomes Higino
@ 2022-04-20 17:52 ` Luis Henrique Gomes Higino
2022-04-20 17:52 ` [bug#55045] [PATCH 4/4] gnu: neovim: replace sexps with gexps Luis Henrique Gomes Higino
2 siblings, 0 replies; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-04-20 17:52 UTC (permalink / raw)
To: 55045; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim): Update to 0.7.0.
---
gnu/packages/vim.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 7279798fe6..d04ee49775 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -668,7 +668,7 @@ (define-public neovim-syntastic
(define-public neovim
(package
(name "neovim")
- (version "0.6.1")
+ (version "0.7.0")
(source
(origin
(method git-fetch)
@@ -677,7 +677,7 @@ (define-public neovim
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx"))))
+ (base32 "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((srfi srfi-26)
--
2.34.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH 4/4] gnu: neovim: replace sexps with gexps.
2022-04-20 17:52 ` [bug#55045] [PATCH 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
2022-04-20 17:52 ` [bug#55045] [PATCH 2/4] gnu: lua-luv: replace sexps with gexps Luis Henrique Gomes Higino
2022-04-20 17:52 ` [bug#55045] [PATCH 3/4] gnu: neovim: Update to 0.7.0 Luis Henrique Gomes Higino
@ 2022-04-20 17:52 ` Luis Henrique Gomes Higino
2 siblings, 0 replies; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-04-20 17:52 UTC (permalink / raw)
To: 55045; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim): replace sexps with gexps.
Also run `guix style neovim`.
---
gnu/packages/vim.scm | 153 ++++++++++++++++++++++---------------------
1 file changed, 78 insertions(+), 75 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index d04ee49775..8ded61e097 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -669,84 +669,86 @@ (define-public neovim
(package
(name "neovim")
(version "0.7.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/neovim/neovim")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g"))))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/neovim/neovim")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g"))))
(build-system cmake-build-system)
(arguments
- `(#:modules ((srfi srfi-26)
- (guix build cmake-build-system)
- (guix build utils))
- #: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
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((lua-version "5.1")
- (lua-cpath-spec
- (lambda (prefix)
- (let ((path (string-append prefix "/lib/lua/" lua-version)))
- (string-append path "/?.so;" path "/?/?.so"))))
- (lua-path-spec
- (lambda (prefix)
- (let ((path (string-append prefix "/share/lua/" lua-version)))
- (string-append path "/?.lua;" path "/?/?.lua"))))
- (lua-inputs (map (cute assoc-ref inputs <>)
- '("lua"
- "lua-luv"
- "lua-lpeg"
- "lua-bitop"
- "lua-libmpack"))))
- (setenv "LUA_PATH"
- (string-join (map lua-path-spec lua-inputs) ";"))
- (setenv "LUA_CPATH"
- (string-join (map lua-cpath-spec lua-inputs) ";"))
- #t)))
- (add-after 'unpack 'prevent-embedding-gcc-store-path
- (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"
- (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc"))
- #t)))))
- (inputs
- `(("libuv" ,libuv)
- ("msgpack" ,msgpack)
- ("libtermkey" ,libtermkey)
- ("libvterm" ,libvterm)
- ("unibilium" ,unibilium)
- ("jemalloc" ,jemalloc)
- ("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)
- ("tree-sitter" ,tree-sitter)))
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("gettext" ,gettext-minimal)
- ("gperf" ,gperf)))
+ (list #:modules
+ '((srfi srfi-26) (guix build cmake-build-system)
+ (guix build utils))
+ #: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
+ (lambda* _
+ (let* ((lua-version "5.1")
+ (lua-cpath-spec (lambda (prefix)
+ (let ((path (string-append
+ prefix
+ "/lib/lua/"
+ lua-version)))
+ (string-append
+ path
+ "/?.so;"
+ path
+ "/?/?.so"))))
+ (lua-path-spec (lambda (prefix)
+ (let ((path (string-append prefix
+ "/share/lua/"
+ lua-version)))
+ (string-append path "/?.lua;"
+ path "/?/?.lua"))))
+ (lua-inputs (list (or #$(this-package-input "lua")
+ #$(this-package-input "luajit"))
+ #$lua5.1-luv
+ #$lua5.1-lpeg
+ #$lua5.1-bitop
+ #$lua5.1-libmpack)))
+ (setenv "LUA_PATH"
+ (string-join (map lua-path-spec lua-inputs) ";"))
+ (setenv "LUA_CPATH"
+ (string-join (map lua-cpath-spec lua-inputs) ";"))
+ #t)))
+ (add-after 'unpack 'prevent-embedding-gcc-store-path
+ (lambda _
+ (substitute* "cmake/GetCompileFlags.cmake"
+ (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc"))
+ #t)))))
+ (inputs (list libuv
+ msgpack
+ libtermkey
+ libvterm
+ unibilium
+ jemalloc
+ (if (member (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ (%current-system))
+ (package-supported-systems luajit))
+ luajit
+ lua-5.1)
+ lua5.1-luv
+ lua5.1-lpeg
+ lua5.1-bitop
+ lua5.1-libmpack
+ tree-sitter))
+ (native-inputs (list pkg-config gettext-minimal gperf))
(home-page "https://neovim.io")
(synopsis "Fork of vim focused on extensibility and agility")
- (description "Neovim is a project that seeks to aggressively
+ (description
+ "Neovim is a project that seeks to aggressively
refactor Vim in order to:
@itemize
@@ -754,7 +756,8 @@ (define-public neovim
@item Split the work between multiple developers
@item Enable advanced external UIs without modifications to the core
@item Improve extensibility with a new plugin architecture
-@end itemize\n")
+@end itemize
+")
;; Neovim is licensed under the terms of the Apache 2.0 license,
;; except for parts that were contributed under the Vim license.
(license (list license:asl2.0 license:vim))))
--
2.34.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH] update neovim to 0.7.0
2022-04-20 17:46 [bug#55045] [PATCH] update neovim to 0.7.0 Luis Henrique Gomes Higino
2022-04-20 17:52 ` [bug#55045] [PATCH 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
@ 2022-04-21 2:47 ` Imran Iqbal
2022-04-22 1:07 ` Luis Henrique Gomes Higino
` (3 subsequent siblings)
5 siblings, 0 replies; 37+ messages in thread
From: Imran Iqbal @ 2022-04-21 2:47 UTC (permalink / raw)
To: 55045
> this patch series updates lua-luv to 1.43.0-0 and neovim to 0.7.0.
I just want to add that libuv should also be updated to 1.43.0 to match
the lua-luv version: https://github.com/luvit/luv/releases/tag/1.43.0-0
I attempted to do that here: https://issues.guix.gnu.org/54982 as part
of my patch set but I messed up sending in the patches and it ended up
spread across a few issues 😅
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH] update neovim to 0.7.0
2022-04-20 17:46 [bug#55045] [PATCH] update neovim to 0.7.0 Luis Henrique Gomes Higino
2022-04-20 17:52 ` [bug#55045] [PATCH 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
2022-04-21 2:47 ` [bug#55045] [PATCH] update neovim to 0.7.0 Imran Iqbal
@ 2022-04-22 1:07 ` Luis Henrique Gomes Higino
2022-04-28 22:35 ` Ludovic Courtès
2022-05-17 23:16 ` [bug#55045] [PATCH v2 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
` (2 subsequent siblings)
5 siblings, 1 reply; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-04-22 1:07 UTC (permalink / raw)
To: 55045; +Cc: Imran Iqbal
Hi Imran,
I think you're right, but I'm somewhat unsure about updating
libuv, as it would cause 13346 packages to be rebuilt
😟. According to the Guix manual, this would result in this patch
having to be applied in the core-updates branch, which could delay
neovim's update significantly.
Regards,
--
Luis H. Higino
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH] update neovim to 0.7.0
2022-04-22 1:07 ` Luis Henrique Gomes Higino
@ 2022-04-28 22:35 ` Ludovic Courtès
2022-05-05 15:02 ` Luis Henrique Gomes Higino
0 siblings, 1 reply; 37+ messages in thread
From: Ludovic Courtès @ 2022-04-28 22:35 UTC (permalink / raw)
To: Luis Henrique Gomes Higino; +Cc: 55045, Imran Iqbal
Hi,
Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com> skribis:
> I think you're right, but I'm somewhat unsure about updating libuv, as
> it would cause 13346 packages to be rebuilt 😟. According to the Guix
> manual, this would result in this patch having to be applied in the
> core-updates branch, which could delay neovim's update significantly.
What you can do is introduce a libuv variant for the version that neovim
needs, as long the lines of the first example at:
https://guix.gnu.org/manual/devel/en/html_node/Defining-Package-Variants.html
HTH!
Ludo’.
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH] update neovim to 0.7.0
2022-04-28 22:35 ` Ludovic Courtès
@ 2022-05-05 15:02 ` Luis Henrique Gomes Higino
2022-05-17 22:49 ` Imran Iqbal
0 siblings, 1 reply; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-05-05 15:02 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 55045, Imran Iqbal
Hi,
Ludovic Courtès <ludo@gnu.org> writes:
> Hi,
>
> Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
> skribis:
>
>> I think you're right, but I'm somewhat unsure about updating
>> libuv, as
>> it would cause 13346 packages to be rebuilt 😟. According to
>> the Guix
>> manual, this would result in this patch having to be applied in
>> the
>> core-updates branch, which could delay neovim's update
>> significantly.
>
> What you can do is introduce a libuv variant for the version
> that neovim
> needs, as long the lines of the first example at:
>
> https://guix.gnu.org/manual/devel/en/html_node/Defining-Package-Variants.html
>
> HTH!
>
> Ludo’.
I have introduced libuv-for-luv, updated it to version 1.43.0 and
put it as the new input for make-lua-luv. Its code follows:
--8<---------------cut here---------------start------------->8---
(define-public libuv-for-luv
;; When upgrading make-lua-luv, also upgrade this. Get the
version from
;; https://github.com/luvit/luv/blob/master/CMakeLists.txt
(package
(inherit libuv)
(name "libuv")
(version "1.43.0")
(source (origin
(method url-fetch)
(uri (string-append "https://dist.libuv.org/dist/v"
version
"/libuv-v" version ".tar.gz"))
(sha256
(base32
"194kwq3jfj9s628kzkchdca534rikjw0xiyas0cjbphqmsvjpmwh"))))
(properties '((hidden? . #t)))))
--8<---------------cut here---------------end--------------->8---
Each version of lua-luv built fine, but building neovim now throws
this error:
--8<---------------cut here---------------start------------->8---
/gnu/store/069aq2v993kpc41yabp5b6vm4wb9jkhg-gcc-10.3.0/bin/gcc
-DNVIM_TS_HAS_SET_MATCH_LIMIT -DNVIM_TS_HAS_SET_ALLOCATOR -O2 -g
-Og -g -flto -fno-fat-lto-objects -Wl,--no-undefined
-Wl,--export-dynamic -rdynamic
CMakeFiles/nvim.dir/auto/lua_api_c_bindings.generated.c.o
CMakeFiles/nvim.dir/__/__/config/auto/pathdef.c.o
CMakeFiles/nvim.dir/api/autocmd.c.o
CMakeFiles/nvim.dir/api/buffer.c.o
CMakeFiles/nvim.dir/api/deprecated.c.o
CMakeFiles/nvim.dir/api/extmark.c.o
CMakeFiles/nvim.dir/api/private/converter.c.o
CMakeFiles/nvim.dir/api/private/dispatch.c.o
CMakeFiles/nvim.dir/api/private/helpers.c.o
CMakeFiles/nvim.dir/api/tabpage.c.o CMakeFiles/nvim.dir/api/ui.c.o
CMakeFiles/nvim.dir/api/vim.c.o
CMakeFiles/nvim.dir/api/vimscript.c.o
CMakeFiles/nvim.dir/api/win_config.c.o
CMakeFiles/nvim.dir/api/window.c.o CMakeFiles/nvim.dir/arabic.c.o
CMakeFiles/nvim.dir/autocmd.c.o CMakeFiles/nvim.dir/buffer.c.o
CMakeFiles/nvim.dir/buffer_updates.c.o
CMakeFiles/nvim.dir/change.c.o CMakeFiles/nvim.dir/channel.c.o
CMakeFiles/nvim.dir/charset.c.o CMakeFiles/nvim.dir/context.c.o
CMakeFiles/nvim.dir/cursor.c.o
CMakeFiles/nvim.dir/cursor_shape.c.o
CMakeFiles/nvim.dir/debugger.c.o
CMakeFiles/nvim.dir/decoration.c.o
CMakeFiles/nvim.dir/decoration_provider.c.o
CMakeFiles/nvim.dir/diff.c.o CMakeFiles/nvim.dir/digraph.c.o
CMakeFiles/nvim.dir/edit.c.o CMakeFiles/nvim.dir/eval.c.o
CMakeFiles/nvim.dir/eval/decode.c.o
CMakeFiles/nvim.dir/eval/encode.c.o
CMakeFiles/nvim.dir/eval/executor.c.o
CMakeFiles/nvim.dir/eval/funcs.c.o CMakeFiles/nvim.dir/eval/gc.c.o
CMakeFiles/nvim.dir/eval/typval.c.o
CMakeFiles/nvim.dir/eval/userfunc.c.o
CMakeFiles/nvim.dir/event/libuv_process.c.o
CMakeFiles/nvim.dir/event/loop.c.o
CMakeFiles/nvim.dir/event/multiqueue.c.o
CMakeFiles/nvim.dir/event/process.c.o
CMakeFiles/nvim.dir/event/rstream.c.o
CMakeFiles/nvim.dir/event/signal.c.o
CMakeFiles/nvim.dir/event/socket.c.o
CMakeFiles/nvim.dir/event/stream.c.o
CMakeFiles/nvim.dir/event/time.c.o
CMakeFiles/nvim.dir/event/wstream.c.o
CMakeFiles/nvim.dir/ex_cmds.c.o CMakeFiles/nvim.dir/ex_cmds2.c.o
CMakeFiles/nvim.dir/ex_docmd.c.o CMakeFiles/nvim.dir/ex_eval.c.o
CMakeFiles/nvim.dir/ex_getln.c.o
CMakeFiles/nvim.dir/ex_session.c.o CMakeFiles/nvim.dir/extmark.c.o
CMakeFiles/nvim.dir/file_search.c.o CMakeFiles/nvim.dir/fileio.c.o
CMakeFiles/nvim.dir/fold.c.o CMakeFiles/nvim.dir/garray.c.o
CMakeFiles/nvim.dir/getchar.c.o CMakeFiles/nvim.dir/hardcopy.c.o
CMakeFiles/nvim.dir/hashtab.c.o CMakeFiles/nvim.dir/highlight.c.o
CMakeFiles/nvim.dir/highlight_group.c.o
CMakeFiles/nvim.dir/if_cscope.c.o CMakeFiles/nvim.dir/indent.c.o
CMakeFiles/nvim.dir/indent_c.c.o CMakeFiles/nvim.dir/input.c.o
CMakeFiles/nvim.dir/keymap.c.o CMakeFiles/nvim.dir/log.c.o
CMakeFiles/nvim.dir/lua/converter.c.o
CMakeFiles/nvim.dir/lua/executor.c.o
CMakeFiles/nvim.dir/lua/spell.c.o
CMakeFiles/nvim.dir/lua/stdlib.c.o
CMakeFiles/nvim.dir/lua/treesitter.c.o
CMakeFiles/nvim.dir/lua/xdiff.c.o CMakeFiles/nvim.dir/main.c.o
CMakeFiles/nvim.dir/map.c.o CMakeFiles/nvim.dir/mark.c.o
CMakeFiles/nvim.dir/marktree.c.o CMakeFiles/nvim.dir/match.c.o
CMakeFiles/nvim.dir/math.c.o CMakeFiles/nvim.dir/mbyte.c.o
CMakeFiles/nvim.dir/memfile.c.o CMakeFiles/nvim.dir/memline.c.o
CMakeFiles/nvim.dir/memory.c.o CMakeFiles/nvim.dir/menu.c.o
CMakeFiles/nvim.dir/message.c.o CMakeFiles/nvim.dir/mouse.c.o
CMakeFiles/nvim.dir/move.c.o
CMakeFiles/nvim.dir/msgpack_rpc/channel.c.o
CMakeFiles/nvim.dir/msgpack_rpc/helpers.c.o
CMakeFiles/nvim.dir/msgpack_rpc/server.c.o
CMakeFiles/nvim.dir/normal.c.o CMakeFiles/nvim.dir/ops.c.o
CMakeFiles/nvim.dir/option.c.o CMakeFiles/nvim.dir/os/dl.c.o
CMakeFiles/nvim.dir/os/env.c.o CMakeFiles/nvim.dir/os/fileio.c.o
CMakeFiles/nvim.dir/os/fs.c.o CMakeFiles/nvim.dir/os/input.c.o
CMakeFiles/nvim.dir/os/lang.c.o CMakeFiles/nvim.dir/os/mem.c.o
CMakeFiles/nvim.dir/os/process.c.o
CMakeFiles/nvim.dir/os/pty_process_unix.c.o
CMakeFiles/nvim.dir/os/shell.c.o CMakeFiles/nvim.dir/os/signal.c.o
CMakeFiles/nvim.dir/os/stdpaths.c.o
CMakeFiles/nvim.dir/os/time.c.o CMakeFiles/nvim.dir/os/tty.c.o
CMakeFiles/nvim.dir/os/users.c.o CMakeFiles/nvim.dir/os_unix.c.o
CMakeFiles/nvim.dir/path.c.o CMakeFiles/nvim.dir/plines.c.o
CMakeFiles/nvim.dir/popupmnu.c.o CMakeFiles/nvim.dir/profile.c.o
CMakeFiles/nvim.dir/quickfix.c.o CMakeFiles/nvim.dir/rbuffer.c.o
CMakeFiles/nvim.dir/regexp.c.o CMakeFiles/nvim.dir/runtime.c.o
CMakeFiles/nvim.dir/screen.c.o CMakeFiles/nvim.dir/search.c.o
CMakeFiles/nvim.dir/sha256.c.o CMakeFiles/nvim.dir/shada.c.o
CMakeFiles/nvim.dir/sign.c.o CMakeFiles/nvim.dir/spell.c.o
CMakeFiles/nvim.dir/spellfile.c.o CMakeFiles/nvim.dir/state.c.o
CMakeFiles/nvim.dir/strings.c.o CMakeFiles/nvim.dir/syntax.c.o
CMakeFiles/nvim.dir/tag.c.o CMakeFiles/nvim.dir/terminal.c.o
CMakeFiles/nvim.dir/testing.c.o CMakeFiles/nvim.dir/tui/input.c.o
CMakeFiles/nvim.dir/tui/terminfo.c.o
CMakeFiles/nvim.dir/tui/tui.c.o CMakeFiles/nvim.dir/ugrid.c.o
CMakeFiles/nvim.dir/ui.c.o CMakeFiles/nvim.dir/ui_bridge.c.o
CMakeFiles/nvim.dir/ui_client.c.o
CMakeFiles/nvim.dir/ui_compositor.c.o CMakeFiles/nvim.dir/undo.c.o
CMakeFiles/nvim.dir/version.c.o
CMakeFiles/nvim.dir/viml/parser/expressions.c.o
CMakeFiles/nvim.dir/viml/parser/parser.c.o
CMakeFiles/nvim.dir/window.c.o
CMakeFiles/nvim.dir/__/cjson/fpconv.c.o
CMakeFiles/nvim.dir/__/cjson/lua_cjson.c.o
CMakeFiles/nvim.dir/__/cjson/strbuf.c.o
CMakeFiles/nvim.dir/__/mpack/conv.c.o
CMakeFiles/nvim.dir/__/mpack/lmpack.c.o
CMakeFiles/nvim.dir/__/mpack/mpack_core.c.o
CMakeFiles/nvim.dir/__/mpack/object.c.o
CMakeFiles/nvim.dir/__/mpack/rpc.c.o
CMakeFiles/nvim.dir/__/xdiff/xdiffi.c.o
CMakeFiles/nvim.dir/__/xdiff/xemit.c.o
CMakeFiles/nvim.dir/__/xdiff/xhistogram.c.o
CMakeFiles/nvim.dir/__/xdiff/xpatience.c.o
CMakeFiles/nvim.dir/__/xdiff/xprepare.c.o
CMakeFiles/nvim.dir/__/xdiff/xutils.c.o -o ../../bin/nvim
-Wl,-rpath,::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-fstack-protector-strong
/gnu/store/l1s7piwdgv6gn5wyma8kv4jyb4fq50qm-lua5.1-luv-1.43.0-0/lib/libluv.so
/gnu/store/z31c2rnjg9djq915ls98pv0mhjbyf423-libuv-1.41.1/lib/libuv.so
-ldl -ldl -lrt -lpthread
/gnu/store/90s2wdqxbxmp8zzbg5ml6pv7k31wskg7-msgpack-3.3.0/lib/libmsgpackc.so
/gnu/store/h0h9f53kiwn19qz60lfgk71dnb9khgqx-libvterm-0.1.4/lib/libvterm.so
/gnu/store/m5nsirsx5ksl7shgvgfrg59sy9c8k015-libtermkey-0.22/lib/libtermkey.so
/gnu/store/ryy66y1fba3ffnzrhvdfgncxwplg84fs-unibilium-2.0.0/lib/libunibilium.so
/gnu/store/vrpll9ix25z91jl2y19lxdij429hndp8-tree-sitter-0.20.6/lib/libtree-sitter.so
-lpthread -lm -lutil
/gnu/store/n958kwq28ykfs64qrykdwns7cpgzl5j3-luajit-2.1.0-beta3/lib/libluajit-5.1.so
/gnu/store/90s2wdqxbxmp8zzbg5ml6pv7k31wskg7-msgpack-3.3.0/lib/libmsgpackc.so
/gnu/store/h0h9f53kiwn19qz60lfgk71dnb9khgqx-libvterm-0.1.4/lib/libvterm.so
/gnu/store/m5nsirsx5ksl7shgvgfrg59sy9c8k015-libtermkey-0.22/lib/libtermkey.so
/gnu/store/ryy66y1fba3ffnzrhvdfgncxwplg84fs-unibilium-2.0.0/lib/libunibilium.so
/gnu/store/vrpll9ix25z91jl2y19lxdij429hndp8-tree-sitter-0.20.6/lib/libtree-sitter.so
-lm -lutil
/gnu/store/n958kwq28ykfs64qrykdwns7cpgzl5j3-luajit-2.1.0-beta3/lib/libluajit-5.1.so
ld:
/gnu/store/l1s7piwdgv6gn5wyma8kv4jyb4fq50qm-lua5.1-luv-1.43.0-0/lib/libluv.so:
undefined reference to `uv_try_write2'
--8<---------------cut here---------------end--------------->8---
I have experimented a bit with the libuv versions and only using
1.41.1 this doesn't happen.
Regards,
--
Luis H. Higino
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH] update neovim to 0.7.0
2022-05-05 15:02 ` Luis Henrique Gomes Higino
@ 2022-05-17 22:49 ` Imran Iqbal
2022-05-17 23:01 ` Luis Henrique Gomes Higino
0 siblings, 1 reply; 37+ messages in thread
From: Imran Iqbal @ 2022-05-17 22:49 UTC (permalink / raw)
To: 55045, Luis Henrique Gomes Higino; +Cc: Ludovic Courtès
Hi Luis,
> I have introduced libuv-for-luv, updated it to version 1.43.0 and put it> as the new input for make-lua-luv
Was the input for neovim also updated (it links against libuv as well)
> /gnu/store/l1s7piwdgv6gn5wyma8kv4jyb4fq50qm-lua5.1-luv-1.43.0-0/lib/libluv.so:
> undefined reference to `uv_try_write2'
`uv_try_write2` was introduced in libuv 1.42.0 see:
https://github.com/libuv/libuv/blob/730e07e2f77a4001bdf6894112271c926399f5a8/ChangeLog#L313
> I have experimented a bit with the libuv versions and only using 1.41.1
> this doesn't happen.
I think this makes sense as it would seem lua-luv is being built with
1.43 but neovim is being compiled against 1.41?
Cheers,
Imran
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH] update neovim to 0.7.0
2022-05-17 22:49 ` Imran Iqbal
@ 2022-05-17 23:01 ` Luis Henrique Gomes Higino
0 siblings, 0 replies; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-05-17 23:01 UTC (permalink / raw)
To: Imran Iqbal; +Cc: 55045, Ludovic Courtès
Hi Imran,
Imran Iqbal <imran@imraniqbal.org> writes:
>
> I think this makes sense as it would seem lua-luv is being built
> with
> 1.43 but neovim is being compiled against 1.41?
>
> Cheers,
> Imran
Oh lord, that was it -_-. I don't believe I missed this. I'll be
sending the new patch series in just a minute. Thank you very
much!
Regards,
--
Luis H. Higino
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH v2 1/4] gnu: lua-luv: Update to 1.43.0-0.
2022-04-20 17:46 [bug#55045] [PATCH] update neovim to 0.7.0 Luis Henrique Gomes Higino
` (2 preceding siblings ...)
2022-04-22 1:07 ` Luis Henrique Gomes Higino
@ 2022-05-17 23:16 ` Luis Henrique Gomes Higino
2022-05-17 23:16 ` [bug#55045] [PATCH v2 2/4] gnu: lua-luv: Use gexps Luis Henrique Gomes Higino
` (2 more replies)
2022-05-18 13:32 ` [bug#55045] [PATCH v3 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
2022-05-18 13:35 ` [bug#55045] About trailing #t Luis Henrique Gomes Higino
5 siblings, 3 replies; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-05-17 23:16 UTC (permalink / raw)
To: 55045; +Cc: Luis Henrique Gomes Higino
* gnu/packages/libevent.scm (libuv-for-luv): New variable
* gnu/packages/lua.scm (lua-luv): Update to 1.43.0-0.
[inputs]: Change libuv to libuv-for-luv.
[native-inputs]: Update lua-compat-5.3 to 0.10.
---
gnu/packages/libevent.scm | 17 +++++++++++++++++
gnu/packages/lua.scm | 13 +++++++------
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index b3a5cd915e..d807315906 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -169,6 +170,22 @@ (define-public libuv-julia
(home-page "https://github.com/JuliaLang/libuv")
(properties '((hidden? . #t))))))
+(define-public libuv-for-luv
+ ;; When upgrading make-lua-luv, also upgrade this. Get the version from
+ ;; https://github.com/luvit/luv/blob/master/CMakeLists.txt
+ (package
+ (inherit libuv)
+ (name "libuv")
+ (version "1.43.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://dist.libuv.org/dist/v" version
+ "/libuv-v" version ".tar.gz"))
+ (sha256
+ (base32
+ "194kwq3jfj9s628kzkchdca534rikjw0xiyas0cjbphqmsvjpmwh"))))
+ (properties '((hidden? . #t)))))
+
(define-public perl-anyevent
(package
(name "perl-anyevent")
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index ee4b7727e0..0662b2d064 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -16,6 +16,7 @@
;;; Copyright © 2021 Vinícius dos Santos Oliveira <vini.ipsmaker@gmail.com>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Brandon Lucas <br@ndon.dk>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -785,7 +786,7 @@ (define-public lua5.2-lpeg
(define (make-lua-luv name lua)
(package
(name name)
- (version "1.32.0-0")
+ (version "1.43.0-0")
(source (origin
;; The release tarball includes the sources of libuv but does
;; not include the pkg-config files.
@@ -796,7 +797,7 @@ (define (make-lua-luv name lua)
(file-name (git-file-name name version))
(sha256
(base32
- "0c65c1lhbl0axnyks3910gjs0z0hw7w6jvl07g8kbpnbvfl4qajh"))))
+ "1yzi4bm845vl84wyv2qw4z1n1v285lgwm681swmp84brfy2s7czp"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are none
@@ -813,22 +814,22 @@ (define (make-lua-luv name lua)
(copy-recursively (assoc-ref inputs "lua-compat")
"lua-compat")
(setenv "CPATH"
- (string-append (getcwd) "/lua-compat:"
+ (string-append (getcwd) "/lua-compat/c-api:"
(or (getenv "CPATH") "")))
#t)))))
(inputs
- (list lua libuv))
+ (list lua libuv-for-luv))
(native-inputs
`(("lua-compat"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/keplerproject/lua-compat-5.3")
- (commit "daebe77a2f498817713df37f0bb316db1d82222f")))
+ (commit "v0.10")))
(file-name "lua-compat-5.3-checkout")
(sha256
(base32
- "02a14nvn7aggg1yikj9h3dcf8aqjbxlws1bfvqbpfxv9d5phnrpz"))))))
+ "1caxn228gx48g6kymp9w7kczgxcg0v0cd5ixsx8viybzkd60dcn4"))))))
(home-page "https://github.com/luvit/luv/")
(synopsis "Libuv bindings for Lua")
(description
--
2.36.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH v2 2/4] gnu: lua-luv: Use gexps.
2022-05-17 23:16 ` [bug#55045] [PATCH v2 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
@ 2022-05-17 23:16 ` Luis Henrique Gomes Higino
2022-05-17 23:16 ` [bug#55045] [PATCH v2 3/4] gnu: neovim: Update to 0.7.0 Luis Henrique Gomes Higino
2022-05-17 23:16 ` [bug#55045] [PATCH v2 4/4] gnu: neovim: Use new style Luis Henrique Gomes Higino
2 siblings, 0 replies; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-05-17 23:16 UTC (permalink / raw)
To: 55045; +Cc: Luis Henrique Gomes Higino
* gnu/packages/lua.scm (lua-luv)[arguments]: Rewrite using gexps.
---
gnu/packages/lua.scm | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 0662b2d064..afebc6bc1f 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -800,23 +800,23 @@ (define (make-lua-luv name lua)
"1yzi4bm845vl84wyv2qw4z1n1v285lgwm681swmp84brfy2s7czp"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; there are none
- #:configure-flags
- '("-DWITH_LUA_ENGINE=Lua"
- "-DWITH_SHARED_LIBUV=On"
- "-DBUILD_MODULE=Off"
- "-DBUILD_SHARED_LIBS=On"
- "-DLUA_BUILD_TYPE=System")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'copy-lua-compat
- (lambda* (#:key inputs #:allow-other-keys)
- (copy-recursively (assoc-ref inputs "lua-compat")
- "lua-compat")
- (setenv "CPATH"
- (string-append (getcwd) "/lua-compat/c-api:"
- (or (getenv "CPATH") "")))
- #t)))))
+ (list #:tests? #f ; there are none
+ #:configure-flags
+ #~'("-DWITH_LUA_ENGINE=Lua"
+ "-DWITH_SHARED_LIBUV=On"
+ "-DBUILD_MODULE=Off"
+ "-DBUILD_SHARED_LIBS=On"
+ "-DLUA_BUILD_TYPE=System")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'copy-lua-compat
+ (lambda* _
+ (copy-recursively #+(this-package-native-input "lua-compat")
+ "lua-compat")
+ (setenv "CPATH"
+ (string-append (getcwd) "/lua-compat/c-api:"
+ (or (getenv "CPATH") "")))
+ #t)))))
(inputs
(list lua libuv-for-luv))
(native-inputs
--
2.36.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH v2 3/4] gnu: neovim: Update to 0.7.0.
2022-05-17 23:16 ` [bug#55045] [PATCH v2 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
2022-05-17 23:16 ` [bug#55045] [PATCH v2 2/4] gnu: lua-luv: Use gexps Luis Henrique Gomes Higino
@ 2022-05-17 23:16 ` Luis Henrique Gomes Higino
2022-05-17 23:16 ` [bug#55045] [PATCH v2 4/4] gnu: neovim: Use new style Luis Henrique Gomes Higino
2 siblings, 0 replies; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-05-17 23:16 UTC (permalink / raw)
To: 55045; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim): Update to 0.7.0.
---
gnu/packages/vim.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index bb459933b0..21a22570ad 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -658,7 +658,7 @@ (define-public neovim-syntastic
(define-public neovim
(package
(name "neovim")
- (version "0.6.1")
+ (version "0.7.0")
(source
(origin
(method git-fetch)
@@ -667,7 +667,7 @@ (define-public neovim
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx"))))
+ (base32 "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((srfi srfi-26)
@@ -713,7 +713,7 @@ (define-public neovim
(("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc"))
#t)))))
(inputs
- `(("libuv" ,libuv)
+ `(("libuv" ,libuv-for-luv)
("msgpack" ,msgpack)
("libtermkey" ,libtermkey)
("libvterm" ,libvterm)
--
2.36.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH v2 4/4] gnu: neovim: Use new style.
2022-05-17 23:16 ` [bug#55045] [PATCH v2 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
2022-05-17 23:16 ` [bug#55045] [PATCH v2 2/4] gnu: lua-luv: Use gexps Luis Henrique Gomes Higino
2022-05-17 23:16 ` [bug#55045] [PATCH v2 3/4] gnu: neovim: Update to 0.7.0 Luis Henrique Gomes Higino
@ 2022-05-17 23:16 ` Luis Henrique Gomes Higino
2022-05-18 11:09 ` Maxime Devos
2 siblings, 1 reply; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-05-17 23:16 UTC (permalink / raw)
To: 55045; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim): Use new style.
[source]: Rewrite using gexps.
[arguments]: Rewrite using gexps.
[inputs and native-inputs]: Remove input labels.
[description]: Run `guix style`.
---
gnu/packages/vim.scm | 153 ++++++++++++++++++++++---------------------
1 file changed, 78 insertions(+), 75 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 21a22570ad..0dfaa45813 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -659,84 +659,86 @@ (define-public neovim
(package
(name "neovim")
(version "0.7.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/neovim/neovim")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g"))))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/neovim/neovim")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g"))))
(build-system cmake-build-system)
(arguments
- `(#:modules ((srfi srfi-26)
- (guix build cmake-build-system)
- (guix build utils))
- #: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
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((lua-version "5.1")
- (lua-cpath-spec
- (lambda (prefix)
- (let ((path (string-append prefix "/lib/lua/" lua-version)))
- (string-append path "/?.so;" path "/?/?.so"))))
- (lua-path-spec
- (lambda (prefix)
- (let ((path (string-append prefix "/share/lua/" lua-version)))
- (string-append path "/?.lua;" path "/?/?.lua"))))
- (lua-inputs (map (cute assoc-ref inputs <>)
- '("lua"
- "lua-luv"
- "lua-lpeg"
- "lua-bitop"
- "lua-libmpack"))))
- (setenv "LUA_PATH"
- (string-join (map lua-path-spec lua-inputs) ";"))
- (setenv "LUA_CPATH"
- (string-join (map lua-cpath-spec lua-inputs) ";"))
- #t)))
- (add-after 'unpack 'prevent-embedding-gcc-store-path
- (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"
- (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc"))
- #t)))))
- (inputs
- `(("libuv" ,libuv-for-luv)
- ("msgpack" ,msgpack)
- ("libtermkey" ,libtermkey)
- ("libvterm" ,libvterm)
- ("unibilium" ,unibilium)
- ("jemalloc" ,jemalloc)
- ("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)
- ("tree-sitter" ,tree-sitter)))
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("gettext" ,gettext-minimal)
- ("gperf" ,gperf)))
+ (list #:modules
+ '((srfi srfi-26) (guix build cmake-build-system)
+ (guix build utils))
+ #: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
+ (lambda* _
+ (let* ((lua-version "5.1")
+ (lua-cpath-spec (lambda (prefix)
+ (let ((path (string-append
+ prefix
+ "/lib/lua/"
+ lua-version)))
+ (string-append
+ path
+ "/?.so;"
+ path
+ "/?/?.so"))))
+ (lua-path-spec (lambda (prefix)
+ (let ((path (string-append prefix
+ "/share/lua/"
+ lua-version)))
+ (string-append path "/?.lua;"
+ path "/?/?.lua"))))
+ (lua-inputs (list (or #$(this-package-input "lua")
+ #$(this-package-input "luajit"))
+ #$lua5.1-luv
+ #$lua5.1-lpeg
+ #$lua5.1-bitop
+ #$lua5.1-libmpack)))
+ (setenv "LUA_PATH"
+ (string-join (map lua-path-spec lua-inputs) ";"))
+ (setenv "LUA_CPATH"
+ (string-join (map lua-cpath-spec lua-inputs) ";"))
+ #t)))
+ (add-after 'unpack 'prevent-embedding-gcc-store-path
+ (lambda _
+ (substitute* "cmake/GetCompileFlags.cmake"
+ (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc"))
+ #t)))))
+ (inputs (list libuv-for-luv
+ msgpack
+ libtermkey
+ libvterm
+ unibilium
+ jemalloc
+ (if (member (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ (%current-system))
+ (package-supported-systems luajit))
+ luajit
+ lua-5.1)
+ lua5.1-luv
+ lua5.1-lpeg
+ lua5.1-bitop
+ lua5.1-libmpack
+ tree-sitter))
+ (native-inputs (list pkg-config gettext-minimal gperf))
(home-page "https://neovim.io")
(synopsis "Fork of vim focused on extensibility and agility")
- (description "Neovim is a project that seeks to aggressively
+ (description
+ "Neovim is a project that seeks to aggressively
refactor Vim in order to:
@itemize
@@ -744,7 +746,8 @@ (define-public neovim
@item Split the work between multiple developers
@item Enable advanced external UIs without modifications to the core
@item Improve extensibility with a new plugin architecture
-@end itemize\n")
+@end itemize
+")
;; Neovim is licensed under the terms of the Apache 2.0 license,
;; except for parts that were contributed under the Vim license.
(license (list license:asl2.0 license:vim))))
--
2.36.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH v2 4/4] gnu: neovim: Use new style.
2022-05-17 23:16 ` [bug#55045] [PATCH v2 4/4] gnu: neovim: Use new style Luis Henrique Gomes Higino
@ 2022-05-18 11:09 ` Maxime Devos
2022-05-18 12:06 ` Luis Henrique Gomes Higino
0 siblings, 1 reply; 37+ messages in thread
From: Maxime Devos @ 2022-05-18 11:09 UTC (permalink / raw)
To: Luis Henrique Gomes Higino, 55045
[-- Attachment #1: Type: text/plain, Size: 1044 bytes --]
Luis Henrique Gomes Higino schreef op di 17-05-2022 om 20:16 [-0300]:
> - (add-after 'unpack 'prevent-embedding-gcc-store-path
> - (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"
> - (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc"))
> - #t)))))
> [...]
> + (add-after 'unpack 'prevent-embedding-gcc-store-path
> + (lambda _
> + (substitute* "cmake/GetCompileFlags.cmake"
> + (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc"))
You dropped a comment here ("guix style" is imperfect)
Greetings,
Maxime.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH v2 4/4] gnu: neovim: Use new style.
2022-05-18 11:09 ` Maxime Devos
@ 2022-05-18 12:06 ` Luis Henrique Gomes Higino
0 siblings, 0 replies; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-05-18 12:06 UTC (permalink / raw)
To: Maxime Devos; +Cc: 55045
HI Maxime,
Maxime Devos <maximedevos@telenet.be> writes:
> [[PGP Signed Part:Undecided]]
> Luis Henrique Gomes Higino schreef op di 17-05-2022 om 20:16
> [-0300]:
>> - (add-after 'unpack 'prevent-embedding-gcc-store-path
>> - (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"
>> - (("\\$\\{CMAKE_C_COMPILER\\}")
>> "/gnu/store/.../bin/gcc"))
>> - #t)))))
>> [...]
>> + (add-after 'unpack
>> 'prevent-embedding-gcc-store-path
>> + (lambda _
>> + (substitute* "cmake/GetCompileFlags.cmake"
>> + (("\\$\\{CMAKE_C_COMPILER\\}")
>> "/gnu/store/.../bin/gcc"))
>
> You dropped a comment here ("guix style" is imperfect)
>
> Greetings,
> Maxime.
>
> [[End of PGP Signed Part]]
thank you for spotting it!
Regards,
--
Luis H. Higino
^ permalink raw reply [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH v3 1/4] gnu: lua-luv: Update to 1.43.0-0.
2022-04-20 17:46 [bug#55045] [PATCH] update neovim to 0.7.0 Luis Henrique Gomes Higino
` (3 preceding siblings ...)
2022-05-17 23:16 ` [bug#55045] [PATCH v2 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
@ 2022-05-18 13:32 ` Luis Henrique Gomes Higino
2022-05-18 13:32 ` [bug#55045] [PATCH v3 2/4] gnu: lua-luv: Use gexps Luis Henrique Gomes Higino
` (3 more replies)
2022-05-18 13:35 ` [bug#55045] About trailing #t Luis Henrique Gomes Higino
5 siblings, 4 replies; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-05-18 13:32 UTC (permalink / raw)
To: 55045; +Cc: Luis Henrique Gomes Higino
* gnu/packages/libevent.scm (libuv-for-luv): New variable
* gnu/packages/lua.scm (lua-luv): Update to 1.43.0-0.
[inputs]: Change libuv to libuv-for-luv.
[native-inputs]: Update lua-compat-5.3 to 0.10.
---
gnu/packages/libevent.scm | 17 +++++++++++++++++
gnu/packages/lua.scm | 13 +++++++------
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index b3a5cd915e..d807315906 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -169,6 +170,22 @@ (define-public libuv-julia
(home-page "https://github.com/JuliaLang/libuv")
(properties '((hidden? . #t))))))
+(define-public libuv-for-luv
+ ;; When upgrading make-lua-luv, also upgrade this. Get the version from
+ ;; https://github.com/luvit/luv/blob/master/CMakeLists.txt
+ (package
+ (inherit libuv)
+ (name "libuv")
+ (version "1.43.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://dist.libuv.org/dist/v" version
+ "/libuv-v" version ".tar.gz"))
+ (sha256
+ (base32
+ "194kwq3jfj9s628kzkchdca534rikjw0xiyas0cjbphqmsvjpmwh"))))
+ (properties '((hidden? . #t)))))
+
(define-public perl-anyevent
(package
(name "perl-anyevent")
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index ee4b7727e0..0662b2d064 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -16,6 +16,7 @@
;;; Copyright © 2021 Vinícius dos Santos Oliveira <vini.ipsmaker@gmail.com>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Brandon Lucas <br@ndon.dk>
+;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -785,7 +786,7 @@ (define-public lua5.2-lpeg
(define (make-lua-luv name lua)
(package
(name name)
- (version "1.32.0-0")
+ (version "1.43.0-0")
(source (origin
;; The release tarball includes the sources of libuv but does
;; not include the pkg-config files.
@@ -796,7 +797,7 @@ (define (make-lua-luv name lua)
(file-name (git-file-name name version))
(sha256
(base32
- "0c65c1lhbl0axnyks3910gjs0z0hw7w6jvl07g8kbpnbvfl4qajh"))))
+ "1yzi4bm845vl84wyv2qw4z1n1v285lgwm681swmp84brfy2s7czp"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are none
@@ -813,22 +814,22 @@ (define (make-lua-luv name lua)
(copy-recursively (assoc-ref inputs "lua-compat")
"lua-compat")
(setenv "CPATH"
- (string-append (getcwd) "/lua-compat:"
+ (string-append (getcwd) "/lua-compat/c-api:"
(or (getenv "CPATH") "")))
#t)))))
(inputs
- (list lua libuv))
+ (list lua libuv-for-luv))
(native-inputs
`(("lua-compat"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/keplerproject/lua-compat-5.3")
- (commit "daebe77a2f498817713df37f0bb316db1d82222f")))
+ (commit "v0.10")))
(file-name "lua-compat-5.3-checkout")
(sha256
(base32
- "02a14nvn7aggg1yikj9h3dcf8aqjbxlws1bfvqbpfxv9d5phnrpz"))))))
+ "1caxn228gx48g6kymp9w7kczgxcg0v0cd5ixsx8viybzkd60dcn4"))))))
(home-page "https://github.com/luvit/luv/")
(synopsis "Libuv bindings for Lua")
(description
--
2.36.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH v3 2/4] gnu: lua-luv: Use gexps.
2022-05-18 13:32 ` [bug#55045] [PATCH v3 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
@ 2022-05-18 13:32 ` Luis Henrique Gomes Higino
2022-05-18 13:32 ` [bug#55045] [PATCH v3 3/4] gnu: neovim: Update to 0.7.0 Luis Henrique Gomes Higino
` (2 subsequent siblings)
3 siblings, 0 replies; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-05-18 13:32 UTC (permalink / raw)
To: 55045; +Cc: Luis Henrique Gomes Higino
* gnu/packages/lua.scm (lua-luv)[arguments]: Rewrite using gexps.
---
gnu/packages/lua.scm | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 0662b2d064..afebc6bc1f 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -800,23 +800,23 @@ (define (make-lua-luv name lua)
"1yzi4bm845vl84wyv2qw4z1n1v285lgwm681swmp84brfy2s7czp"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; there are none
- #:configure-flags
- '("-DWITH_LUA_ENGINE=Lua"
- "-DWITH_SHARED_LIBUV=On"
- "-DBUILD_MODULE=Off"
- "-DBUILD_SHARED_LIBS=On"
- "-DLUA_BUILD_TYPE=System")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'copy-lua-compat
- (lambda* (#:key inputs #:allow-other-keys)
- (copy-recursively (assoc-ref inputs "lua-compat")
- "lua-compat")
- (setenv "CPATH"
- (string-append (getcwd) "/lua-compat/c-api:"
- (or (getenv "CPATH") "")))
- #t)))))
+ (list #:tests? #f ; there are none
+ #:configure-flags
+ #~'("-DWITH_LUA_ENGINE=Lua"
+ "-DWITH_SHARED_LIBUV=On"
+ "-DBUILD_MODULE=Off"
+ "-DBUILD_SHARED_LIBS=On"
+ "-DLUA_BUILD_TYPE=System")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'copy-lua-compat
+ (lambda* _
+ (copy-recursively #+(this-package-native-input "lua-compat")
+ "lua-compat")
+ (setenv "CPATH"
+ (string-append (getcwd) "/lua-compat/c-api:"
+ (or (getenv "CPATH") "")))
+ #t)))))
(inputs
(list lua libuv-for-luv))
(native-inputs
--
2.36.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH v3 3/4] gnu: neovim: Update to 0.7.0.
2022-05-18 13:32 ` [bug#55045] [PATCH v3 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
2022-05-18 13:32 ` [bug#55045] [PATCH v3 2/4] gnu: lua-luv: Use gexps Luis Henrique Gomes Higino
@ 2022-05-18 13:32 ` Luis Henrique Gomes Higino
2022-05-18 13:32 ` [bug#55045] [PATCH v3 4/4] gnu: neovim: Use new style Luis Henrique Gomes Higino
2022-05-18 18:12 ` bug#55045: [PATCH] update neovim to 0.7.0 Ludovic Courtès
3 siblings, 0 replies; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-05-18 13:32 UTC (permalink / raw)
To: 55045; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim): Update to 0.7.0.
---
gnu/packages/vim.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index bb459933b0..21a22570ad 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -658,7 +658,7 @@ (define-public neovim-syntastic
(define-public neovim
(package
(name "neovim")
- (version "0.6.1")
+ (version "0.7.0")
(source
(origin
(method git-fetch)
@@ -667,7 +667,7 @@ (define-public neovim
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx"))))
+ (base32 "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((srfi srfi-26)
@@ -713,7 +713,7 @@ (define-public neovim
(("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc"))
#t)))))
(inputs
- `(("libuv" ,libuv)
+ `(("libuv" ,libuv-for-luv)
("msgpack" ,msgpack)
("libtermkey" ,libtermkey)
("libvterm" ,libvterm)
--
2.36.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#55045] [PATCH v3 4/4] gnu: neovim: Use new style.
2022-05-18 13:32 ` [bug#55045] [PATCH v3 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
2022-05-18 13:32 ` [bug#55045] [PATCH v3 2/4] gnu: lua-luv: Use gexps Luis Henrique Gomes Higino
2022-05-18 13:32 ` [bug#55045] [PATCH v3 3/4] gnu: neovim: Update to 0.7.0 Luis Henrique Gomes Higino
@ 2022-05-18 13:32 ` Luis Henrique Gomes Higino
2022-05-18 18:12 ` bug#55045: [PATCH] update neovim to 0.7.0 Ludovic Courtès
3 siblings, 0 replies; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-05-18 13:32 UTC (permalink / raw)
To: 55045; +Cc: Luis Henrique Gomes Higino
* gnu/packages/vim.scm (neovim): Use new style.
[source]: Rewrite using gexps.
[arguments]: Rewrite using gexps.
[inputs and native-inputs]: Remove input labels.
[description]: Run `guix style`.
---
gnu/packages/vim.scm | 156 ++++++++++++++++++++++---------------------
1 file changed, 81 insertions(+), 75 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 21a22570ad..caf9ea85b3 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -659,84 +659,89 @@ (define-public neovim
(package
(name "neovim")
(version "0.7.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/neovim/neovim")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g"))))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/neovim/neovim")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g"))))
(build-system cmake-build-system)
(arguments
- `(#:modules ((srfi srfi-26)
- (guix build cmake-build-system)
- (guix build utils))
- #: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
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((lua-version "5.1")
- (lua-cpath-spec
- (lambda (prefix)
- (let ((path (string-append prefix "/lib/lua/" lua-version)))
- (string-append path "/?.so;" path "/?/?.so"))))
- (lua-path-spec
- (lambda (prefix)
- (let ((path (string-append prefix "/share/lua/" lua-version)))
- (string-append path "/?.lua;" path "/?/?.lua"))))
- (lua-inputs (map (cute assoc-ref inputs <>)
- '("lua"
- "lua-luv"
- "lua-lpeg"
- "lua-bitop"
- "lua-libmpack"))))
- (setenv "LUA_PATH"
- (string-join (map lua-path-spec lua-inputs) ";"))
- (setenv "LUA_CPATH"
- (string-join (map lua-cpath-spec lua-inputs) ";"))
- #t)))
- (add-after 'unpack 'prevent-embedding-gcc-store-path
- (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"
- (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc"))
- #t)))))
- (inputs
- `(("libuv" ,libuv-for-luv)
- ("msgpack" ,msgpack)
- ("libtermkey" ,libtermkey)
- ("libvterm" ,libvterm)
- ("unibilium" ,unibilium)
- ("jemalloc" ,jemalloc)
- ("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)
- ("tree-sitter" ,tree-sitter)))
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("gettext" ,gettext-minimal)
- ("gperf" ,gperf)))
+ (list #:modules
+ '((srfi srfi-26) (guix build cmake-build-system)
+ (guix build utils))
+ #: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
+ (lambda* _
+ (let* ((lua-version "5.1")
+ (lua-cpath-spec (lambda (prefix)
+ (let ((path (string-append
+ prefix
+ "/lib/lua/"
+ lua-version)))
+ (string-append
+ path
+ "/?.so;"
+ path
+ "/?/?.so"))))
+ (lua-path-spec (lambda (prefix)
+ (let ((path (string-append prefix
+ "/share/lua/"
+ lua-version)))
+ (string-append path "/?.lua;"
+ path "/?/?.lua"))))
+ (lua-inputs (list (or #$(this-package-input "lua")
+ #$(this-package-input "luajit"))
+ #$lua5.1-luv
+ #$lua5.1-lpeg
+ #$lua5.1-bitop
+ #$lua5.1-libmpack)))
+ (setenv "LUA_PATH"
+ (string-join (map lua-path-spec lua-inputs) ";"))
+ (setenv "LUA_CPATH"
+ (string-join (map lua-cpath-spec lua-inputs) ";"))
+ #t)))
+ (add-after 'unpack 'prevent-embedding-gcc-store-path
+ (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"
+ (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc"))
+ #t)))))
+ (inputs (list libuv-for-luv
+ msgpack
+ libtermkey
+ libvterm
+ unibilium
+ jemalloc
+ (if (member (if (%current-target-system)
+ (gnu-triplet->nix-system (%current-target-system))
+ (%current-system))
+ (package-supported-systems luajit))
+ luajit
+ lua-5.1)
+ lua5.1-luv
+ lua5.1-lpeg
+ lua5.1-bitop
+ lua5.1-libmpack
+ tree-sitter))
+ (native-inputs (list pkg-config gettext-minimal gperf))
(home-page "https://neovim.io")
(synopsis "Fork of vim focused on extensibility and agility")
- (description "Neovim is a project that seeks to aggressively
+ (description
+ "Neovim is a project that seeks to aggressively
refactor Vim in order to:
@itemize
@@ -744,7 +749,8 @@ (define-public neovim
@item Split the work between multiple developers
@item Enable advanced external UIs without modifications to the core
@item Improve extensibility with a new plugin architecture
-@end itemize\n")
+@end itemize
+")
;; Neovim is licensed under the terms of the Apache 2.0 license,
;; except for parts that were contributed under the Vim license.
(license (list license:asl2.0 license:vim))))
--
2.36.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#55045] About trailing #t
2022-04-20 17:46 [bug#55045] [PATCH] update neovim to 0.7.0 Luis Henrique Gomes Higino
` (4 preceding siblings ...)
2022-05-18 13:32 ` [bug#55045] [PATCH v3 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
@ 2022-05-18 13:35 ` Luis Henrique Gomes Higino
2022-05-18 18:33 ` Tobias Geerinckx-Rice via Guix-patches via
5 siblings, 1 reply; 37+ messages in thread
From: Luis Henrique Gomes Higino @ 2022-05-18 13:35 UTC (permalink / raw)
To: 55045
Hi guix,
I have seen recently some commits removing the trailing #t from
build phases. Is that supposed to be how build phases are written
from now on? If so, I'll be rewritting these patches accordingly
(maybe I should've asked this before sending the v3 series 🤦).
Regards,
--
Luis H. Higino
^ permalink raw reply [flat|nested] 37+ messages in thread
* bug#55045: [PATCH] update neovim to 0.7.0
2022-05-18 13:32 ` [bug#55045] [PATCH v3 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
` (2 preceding siblings ...)
2022-05-18 13:32 ` [bug#55045] [PATCH v3 4/4] gnu: neovim: Use new style Luis Henrique Gomes Higino
@ 2022-05-18 18:12 ` Ludovic Courtès
2022-04-17 3:34 ` [bug#54981] [PATCH 0/3] Update neovim to version 0.7.0 Imran Iqbal
3 siblings, 1 reply; 37+ messages in thread
From: Ludovic Courtès @ 2022-05-18 18:12 UTC (permalink / raw)
To: Luis Henrique Gomes Higino; +Cc: 55045-done, Maxime Devos
Hello,
I applied v3 of all four patches. Thanks, and thanks to Maxime for
reviewing!
Ludo’.
^ permalink raw reply [flat|nested] 37+ messages in thread
* bug#54983: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0)
2022-04-17 3:34 ` [bug#54983] [PATCH 2/3] gnu: lua-luv: Update to 1.43.0-0 Imran Iqbal
2022-04-17 5:18 ` bug#54983: Acknowledgement ([PATCH 2/3] gnu: lua-luv: Update to 1.43.0-0.) GNU bug Tracking System
@ 2022-05-18 18:13 ` GNU bug Tracking System
1 sibling, 0 replies; 37+ messages in thread
From: GNU bug Tracking System @ 2022-05-18 18:13 UTC (permalink / raw)
To: guix-patches
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
Your bug report
#55045: [PATCH 2/3] gnu: lua-luv: Update to 1.43.0-0.
which was filed against the guix-patches package, has been closed.
The explanation is attached below, along with your original report.
If you require more details, please reply to 54983@debbugs.gnu.org.
--
55045: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55045
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
[-- Attachment #2: Type: message/rfc822, Size: 3207 bytes --]
From: "Ludovic Courtès" <ludo@gnu.org>
To: Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
Cc: 55045-done@debbugs.gnu.org, Maxime Devos <maximedevos@telenet.be>
Subject: Re: bug#55045: [PATCH] update neovim to 0.7.0
Date: Wed, 18 May 2022 20:12:03 +0200
Message-ID: <87tu9m1zik.fsf_-_@gnu.org>
Hello,
I applied v3 of all four patches. Thanks, and thanks to Maxime for
reviewing!
Ludo’.
[-- Attachment #3: Type: message/rfc822, Size: 7932 bytes --]
From: Imran Iqbal <imran@imraniqbal.org>
To: guix-patches@gnu.org
Cc: Imran Iqbal <imran@imraniqbal.org>
Subject: [PATCH 2/3] gnu: lua-luv: Update to 1.43.0-0.
Date: Sat, 16 Apr 2022 23:34:15 -0400
Message-ID: <20220417033416.333057-3-imran@imraniqbal.org>
* gnu/packages/lua.scm (lua-luv): Update to 1.43.0-0.
---
gnu/packages/lua.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index ee4b7727e0..e91d04cbd0 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -785,7 +785,7 @@ (define-public lua5.2-lpeg
(define (make-lua-luv name lua)
(package
(name name)
- (version "1.32.0-0")
+ (version "1.43.0-0")
(source (origin
;; The release tarball includes the sources of libuv but does
;; not include the pkg-config files.
@@ -796,7 +796,7 @@ (define (make-lua-luv name lua)
(file-name (git-file-name name version))
(sha256
(base32
- "0c65c1lhbl0axnyks3910gjs0z0hw7w6jvl07g8kbpnbvfl4qajh"))))
+ "1yzi4bm845vl84wyv2qw4z1n1v285lgwm681swmp84brfy2s7czp"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are none
@@ -813,7 +813,7 @@ (define (make-lua-luv name lua)
(copy-recursively (assoc-ref inputs "lua-compat")
"lua-compat")
(setenv "CPATH"
- (string-append (getcwd) "/lua-compat:"
+ (string-append (getcwd) "/lua-compat/c-api:"
(or (getenv "CPATH") "")))
#t)))))
(inputs
@@ -824,11 +824,11 @@ (define (make-lua-luv name lua)
(method git-fetch)
(uri (git-reference
(url "https://github.com/keplerproject/lua-compat-5.3")
- (commit "daebe77a2f498817713df37f0bb316db1d82222f")))
+ (commit "e245d3a18957e43ef902a59a72c8902e2e4435b9")))
(file-name "lua-compat-5.3-checkout")
(sha256
(base32
- "02a14nvn7aggg1yikj9h3dcf8aqjbxlws1bfvqbpfxv9d5phnrpz"))))))
+ "1caxn228gx48g6kymp9w7kczgxcg0v0cd5ixsx8viybzkd60dcn4"))))))
(home-page "https://github.com/luvit/luv/")
(synopsis "Libuv bindings for Lua")
(description
--
2.35.3
^ permalink raw reply related [flat|nested] 37+ messages in thread
* bug#54981: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0)
2022-04-17 3:34 ` [bug#54981] [PATCH 0/3] Update neovim to version 0.7.0 Imran Iqbal
` (4 preceding siblings ...)
2022-04-17 8:07 ` [bug#54981] [PATCH 0/3] Update neovim to version 0.7.0 Maxime Devos
@ 2022-05-18 18:13 ` GNU bug Tracking System
5 siblings, 0 replies; 37+ messages in thread
From: GNU bug Tracking System @ 2022-05-18 18:13 UTC (permalink / raw)
To: guix-patches
[-- Attachment #1: Type: text/plain, Size: 417 bytes --]
Your bug report
#55045: [PATCH 0/3] Update neovim to version 0.7.0
which was filed against the guix-patches package, has been closed.
The explanation is attached below, along with your original report.
If you require more details, please reply to 54981@debbugs.gnu.org.
--
55045: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55045
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
[-- Attachment #2: Type: message/rfc822, Size: 3207 bytes --]
From: "Ludovic Courtès" <ludo@gnu.org>
To: Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
Cc: 55045-done@debbugs.gnu.org, Maxime Devos <maximedevos@telenet.be>
Subject: Re: bug#55045: [PATCH] update neovim to 0.7.0
Date: Wed, 18 May 2022 20:12:03 +0200
Message-ID: <87tu9m1zik.fsf_-_@gnu.org>
Hello,
I applied v3 of all four patches. Thanks, and thanks to Maxime for
reviewing!
Ludo’.
[-- Attachment #3: Type: message/rfc822, Size: 6130 bytes --]
From: Imran Iqbal <imran@imraniqbal.org>
To: guix-patches@gnu.org
Subject: [PATCH 0/3] Update neovim to version 0.7.0
Date: Sat, 16 Apr 2022 23:34:13 -0400
Message-ID: <20220417033416.333057-1-imran@imraniqbal.org>
Hi,
This set of patches brings neovim up to version 0.7.0. A change was
introduced:
https://github.com/neovim/neovim/commit/55ab76a1c0f63ebb735495a91066cbe01b6d0bb3
that bumps the required version lua-luv to 1.43.0-0, which subsequently
required libuv to bumped to 1.43.0 as well.
lua-compat-5.3 was bumped to e245d3a18957e43ef902a59a72c8902e2e4435b9
which moves the compat-5.3.h header file under a new c-api folder see:
https://github.com/luvit/luv/commit/60946d35ad6ba80d836e70174e0610ed32c3eb01
^ permalink raw reply [flat|nested] 37+ messages in thread
* bug#54984: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0)
2022-04-17 3:34 ` [bug#54984] [PATCH 3/3] gnu: neovim: Update to 0.7.0 Imran Iqbal
2022-04-17 5:18 ` bug#54984: Acknowledgement ([PATCH 3/3] gnu: neovim: Update to 0.7.0.) GNU bug Tracking System
@ 2022-05-18 18:13 ` GNU bug Tracking System
1 sibling, 0 replies; 37+ messages in thread
From: GNU bug Tracking System @ 2022-05-18 18:13 UTC (permalink / raw)
To: guix-patches
[-- Attachment #1: Type: text/plain, Size: 416 bytes --]
Your bug report
#55045: [PATCH 3/3] gnu: neovim: Update to 0.7.0.
which was filed against the guix-patches package, has been closed.
The explanation is attached below, along with your original report.
If you require more details, please reply to 54984@debbugs.gnu.org.
--
55045: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55045
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
[-- Attachment #2: Type: message/rfc822, Size: 3207 bytes --]
From: "Ludovic Courtès" <ludo@gnu.org>
To: Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
Cc: 55045-done@debbugs.gnu.org, Maxime Devos <maximedevos@telenet.be>
Subject: Re: bug#55045: [PATCH] update neovim to 0.7.0
Date: Wed, 18 May 2022 20:12:03 +0200
Message-ID: <87tu9m1zik.fsf_-_@gnu.org>
Hello,
I applied v3 of all four patches. Thanks, and thanks to Maxime for
reviewing!
Ludo’.
[-- Attachment #3: Type: message/rfc822, Size: 6654 bytes --]
From: Imran Iqbal <imran@imraniqbal.org>
To: guix-patches@gnu.org
Cc: Imran Iqbal <imran@imraniqbal.org>
Subject: [PATCH 3/3] gnu: neovim: Update to 0.7.0.
Date: Sat, 16 Apr 2022 23:34:16 -0400
Message-ID: <20220417033416.333057-4-imran@imraniqbal.org>
* gnu/packages/vim.scm (neovim): Update to 0.7.0.
---
gnu/packages/vim.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 7279798fe6..d04ee49775 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -668,7 +668,7 @@ (define-public neovim-syntastic
(define-public neovim
(package
(name "neovim")
- (version "0.6.1")
+ (version "0.7.0")
(source
(origin
(method git-fetch)
@@ -677,7 +677,7 @@ (define-public neovim
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx"))))
+ (base32 "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((srfi srfi-26)
--
2.35.3
^ permalink raw reply related [flat|nested] 37+ messages in thread
* bug#54982: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0)
2022-04-17 3:34 ` [bug#54982] [PATCH 1/3] gnu: libuv: Update to 1.43.0 Imran Iqbal
2022-04-17 5:18 ` bug#54982: Acknowledgement ([PATCH 1/3] gnu: libuv: Update to 1.43.0.) GNU bug Tracking System
@ 2022-05-18 18:13 ` GNU bug Tracking System
1 sibling, 0 replies; 37+ messages in thread
From: GNU bug Tracking System @ 2022-05-18 18:13 UTC (permalink / raw)
To: guix-patches
[-- Attachment #1: Type: text/plain, Size: 416 bytes --]
Your bug report
#55045: [PATCH 1/3] gnu: libuv: Update to 1.43.0.
which was filed against the guix-patches package, has been closed.
The explanation is attached below, along with your original report.
If you require more details, please reply to 54982@debbugs.gnu.org.
--
55045: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55045
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
[-- Attachment #2: Type: message/rfc822, Size: 3207 bytes --]
From: "Ludovic Courtès" <ludo@gnu.org>
To: Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
Cc: 55045-done@debbugs.gnu.org, Maxime Devos <maximedevos@telenet.be>
Subject: Re: bug#55045: [PATCH] update neovim to 0.7.0
Date: Wed, 18 May 2022 20:12:03 +0200
Message-ID: <87tu9m1zik.fsf_-_@gnu.org>
Hello,
I applied v3 of all four patches. Thanks, and thanks to Maxime for
reviewing!
Ludo’.
[-- Attachment #3: Type: message/rfc822, Size: 6752 bytes --]
From: Imran Iqbal <imran@imraniqbal.org>
To: guix-patches@gnu.org
Cc: Imran Iqbal <imran@imraniqbal.org>
Subject: [PATCH 1/3] gnu: libuv: Update to 1.43.0.
Date: Sat, 16 Apr 2022 23:34:14 -0400
Message-ID: <20220417033416.333057-2-imran@imraniqbal.org>
* gnu/packages/libevent.scm (libuv): Update to 1.43.0.
---
gnu/packages/libevent.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index b3a5cd915e..e5b05ed1b6 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -104,14 +104,14 @@ (define-public libev
(define-public libuv
(package
(name "libuv")
- (version "1.41.1")
+ (version "1.43.0")
(source (origin
(method url-fetch)
(uri (string-append "https://dist.libuv.org/dist/v" version
"/libuv-v" version ".tar.gz"))
(sha256
(base32
- "0zb818sjwnxn5yv3qvkxaprjf037yqmjipk5i3a8rg1q4izhrnv5"))))
+ "194kwq3jfj9s628kzkchdca534rikjw0xiyas0cjbphqmsvjpmwh"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-static")
--
2.35.3
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [bug#55045] About trailing #t
2022-05-18 13:35 ` [bug#55045] About trailing #t Luis Henrique Gomes Higino
@ 2022-05-18 18:33 ` Tobias Geerinckx-Rice via Guix-patches via
0 siblings, 0 replies; 37+ messages in thread
From: Tobias Geerinckx-Rice via Guix-patches via @ 2022-05-18 18:33 UTC (permalink / raw)
To: Luis Henrique Gomes Higino; +Cc: 55045
On 2022-05-18 15:35, Luis Henrique Gomes Higino wrote:
> I have seen recently some commits removing the trailing #t from build
> phases. Is that supposed to be how build phases are written from now
> on?
Yep. If you see any warnings to the contrary you may ignore them as
obsolete.
> If so, I'll be rewritting these patches accordingly (maybe I
> should've asked this before sending the v3 series 🤦).
In such minor cases the committer often makes the change themselves
before pushing. Doing so yourself in a v3 is fine too — your call!
Kind regards,
T G-R
Sent from a Web browser. Excuse or enjoy my brevity.
^ permalink raw reply [flat|nested] 37+ messages in thread
end of thread, other threads:[~2022-05-18 18:34 UTC | newest]
Thread overview: 37+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-20 17:46 [bug#55045] [PATCH] update neovim to 0.7.0 Luis Henrique Gomes Higino
2022-04-20 17:52 ` [bug#55045] [PATCH 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
2022-04-20 17:52 ` [bug#55045] [PATCH 2/4] gnu: lua-luv: replace sexps with gexps Luis Henrique Gomes Higino
2022-04-20 17:52 ` [bug#55045] [PATCH 3/4] gnu: neovim: Update to 0.7.0 Luis Henrique Gomes Higino
2022-04-20 17:52 ` [bug#55045] [PATCH 4/4] gnu: neovim: replace sexps with gexps Luis Henrique Gomes Higino
2022-04-21 2:47 ` [bug#55045] [PATCH] update neovim to 0.7.0 Imran Iqbal
2022-04-22 1:07 ` Luis Henrique Gomes Higino
2022-04-28 22:35 ` Ludovic Courtès
2022-05-05 15:02 ` Luis Henrique Gomes Higino
2022-05-17 22:49 ` Imran Iqbal
2022-05-17 23:01 ` Luis Henrique Gomes Higino
2022-05-17 23:16 ` [bug#55045] [PATCH v2 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
2022-05-17 23:16 ` [bug#55045] [PATCH v2 2/4] gnu: lua-luv: Use gexps Luis Henrique Gomes Higino
2022-05-17 23:16 ` [bug#55045] [PATCH v2 3/4] gnu: neovim: Update to 0.7.0 Luis Henrique Gomes Higino
2022-05-17 23:16 ` [bug#55045] [PATCH v2 4/4] gnu: neovim: Use new style Luis Henrique Gomes Higino
2022-05-18 11:09 ` Maxime Devos
2022-05-18 12:06 ` Luis Henrique Gomes Higino
2022-05-18 13:32 ` [bug#55045] [PATCH v3 1/4] gnu: lua-luv: Update to 1.43.0-0 Luis Henrique Gomes Higino
2022-05-18 13:32 ` [bug#55045] [PATCH v3 2/4] gnu: lua-luv: Use gexps Luis Henrique Gomes Higino
2022-05-18 13:32 ` [bug#55045] [PATCH v3 3/4] gnu: neovim: Update to 0.7.0 Luis Henrique Gomes Higino
2022-05-18 13:32 ` [bug#55045] [PATCH v3 4/4] gnu: neovim: Use new style Luis Henrique Gomes Higino
2022-05-18 18:12 ` bug#55045: [PATCH] update neovim to 0.7.0 Ludovic Courtès
2022-04-17 3:34 ` [bug#54981] [PATCH 0/3] Update neovim to version 0.7.0 Imran Iqbal
2022-04-17 3:34 ` [bug#54982] [PATCH 1/3] gnu: libuv: Update to 1.43.0 Imran Iqbal
2022-04-17 5:18 ` bug#54982: Acknowledgement ([PATCH 1/3] gnu: libuv: Update to 1.43.0.) GNU bug Tracking System
2022-05-18 18:13 ` bug#54982: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0) GNU bug Tracking System
2022-04-17 3:34 ` [bug#54983] [PATCH 2/3] gnu: lua-luv: Update to 1.43.0-0 Imran Iqbal
2022-04-17 5:18 ` bug#54983: Acknowledgement ([PATCH 2/3] gnu: lua-luv: Update to 1.43.0-0.) GNU bug Tracking System
2022-05-18 18:13 ` bug#54983: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0) GNU bug Tracking System
2022-04-17 3:34 ` [bug#54984] [PATCH 3/3] gnu: neovim: Update to 0.7.0 Imran Iqbal
2022-04-17 5:18 ` bug#54984: Acknowledgement ([PATCH 3/3] gnu: neovim: Update to 0.7.0.) GNU bug Tracking System
2022-05-18 18:13 ` bug#54984: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0) GNU bug Tracking System
2022-04-17 5:18 ` bug#54981: Acknowledgement ([PATCH 0/3] Update neovim to version 0.7.0) GNU bug Tracking System
2022-04-17 8:07 ` [bug#54981] [PATCH 0/3] Update neovim to version 0.7.0 Maxime Devos
2022-05-18 18:13 ` bug#54981: closed (Re: bug#55045: [PATCH] update neovim to 0.7.0) GNU bug Tracking System
2022-05-18 13:35 ` [bug#55045] About trailing #t Luis Henrique Gomes Higino
2022-05-18 18:33 ` Tobias Geerinckx-Rice via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).