From: Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
To: 55045@debbugs.gnu.org
Cc: Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
Subject: [bug#55045] [PATCH 4/4] gnu: neovim: replace sexps with gexps.
Date: Wed, 20 Apr 2022 14:52:41 -0300 [thread overview]
Message-ID: <90d9b054aa3eb057828ccdfee15a224fe6d0992e.1650477097.git.luishenriquegh2701@gmail.com> (raw)
In-Reply-To: <abf92fc750ff1669799ca71ab315c8b6b82f5f83.1650477097.git.luishenriquegh2701@gmail.com>
* 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
next prev parent reply other threads:[~2022-04-20 17:54 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Luis Henrique Gomes Higino [this message]
2022-04-21 2:47 ` [bug#55045] [PATCH] update neovim " 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=90d9b054aa3eb057828ccdfee15a224fe6d0992e.1650477097.git.luishenriquegh2701@gmail.com \
--to=luishenriquegh2701@gmail.com \
--cc=55045@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).