From: SeerLite via Guix-patches via <guix-patches@gnu.org>
To: 54221@debbugs.gnu.org
Cc: SeerLite <seerlite@nixnet.email>
Subject: [bug#54221] [PATCH 4/4] gnu: neovim: Update package style.
Date: Wed, 2 Mar 2022 10:17:35 -0300 [thread overview]
Message-ID: <0ee8ec7a501cf53dc1b70b0ba21f72c0f3dc2d58.1646227054.git.seerlite@nixnet.email> (raw)
In-Reply-To: <f06b71a730f11b473963e3925d216bf30f7f307e.1646227054.git.seerlite@nixnet.email>
* gnu/packages/vim.scm (neovim)[inputs]: Remove labels.
[native-inputs]: Remove "guix.vim" gexp and remove labels.
[arguments]: Convert to list of gexps, inline the "guix.vim" gexp, adjust lua
input names and remove trailing #t's.
---
gnu/packages/vim.scm | 114 +++++++++++++++++++++----------------------
1 file changed, 55 insertions(+), 59 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index d5d8b412f7..5e6439ed00 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -676,70 +676,66 @@ (define-public neovim
(base32 "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"))))
(build-system cmake-build-system)
(arguments
- `(#:modules ((srfi srfi-26)
+ (list
+ #:modules `((srfi srfi-26)
(guix build cmake-build-system)
(guix build utils))
- #:configure-flags '("-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))
- (add-after 'install 'install-guix.vim
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((nvimdir (string-append (assoc-ref outputs "out") "/share/nvim")))
- (mkdir-p nvimdir)
- (copy-file (assoc-ref inputs "guix.vim")
- (string-append nvimdir "/sysinit.vim"))))))))
+ #:configure-flags #~(list "-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"
+ "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) ";")))))
+ (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"))))
+ (add-after 'install 'install-guix.vim
+ (lambda _
+ (let ((vimdir (string-append #$output "/share/nvim"))
+ (vimrc #$(local-file (search-auxiliary-file "guix.vim"))))
+ (mkdir-p vimdir)
+ (copy-file vimrc (string-append vimdir "/sysinit.vim"))))))))
(native-search-paths
- (list (search-path-specification
- (variable "GUIX_VIMRUNTIME")
- (separator ",")
- (files (list "share/vim/vimfiles")))))
+ (list (search-path-specification
+ (variable "GUIX_VIMRUNTIME")
+ (separator ",")
+ (files (list "share/vim/vimfiles")))))
(inputs
- `(("libuv" ,libuv)
- ("msgpack" ,msgpack)
- ("libtermkey" ,libtermkey)
- ("libvterm" ,libvterm)
- ("unibilium" ,unibilium)
- ("jemalloc" ,jemalloc)
- ("lua" ,lua-5.1)
- ("lua-luv" ,lua5.1-luv)
- ("lua-lpeg" ,lua5.1-lpeg)
- ("lua-bitop" ,lua5.1-bitop)
- ("lua-libmpack" ,lua5.1-libmpack)))
+ (list libuv
+ msgpack
+ libtermkey
+ libvterm
+ unibilium
+ jemalloc
+ lua-5.1
+ lua5.1-luv
+ lua5.1-lpeg
+ lua5.1-bitop
+ lua5.1-libmpack))
(native-inputs
- `(("pkg-config" ,pkg-config)
- ("gettext" ,gettext-minimal)
- ("gperf" ,gperf)
- ("guix.vim" ,(search-auxiliary-file "guix.vim"))))
+ (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
--
2.34.0
next prev parent reply other threads:[~2022-03-02 14:22 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-02 13:11 [bug#54221] [PATCH 0/4] vim: Detect plugins via search paths SeerLite via Guix-patches via
2022-03-02 13:17 ` [bug#54221] [PATCH 1/4] gnu: vim: Use native-search-paths to search for plugins SeerLite via Guix-patches via
2022-03-02 13:17 ` [bug#54221] [PATCH 2/4] gnu: neovim: Search and use installed plugins, like vim SeerLite via Guix-patches via
2022-03-02 18:30 ` Maxime Devos
2022-03-02 13:17 ` [bug#54221] [PATCH 3/4] gnu: vim: Update package style SeerLite via Guix-patches via
2022-03-02 18:25 ` Maxime Devos
2022-03-02 18:29 ` Maxime Devos
2022-03-03 16:49 ` SeerLite via Guix-patches via
2022-03-03 17:46 ` Maxime Devos
2022-03-02 18:35 ` Maxime Devos
2022-03-03 17:40 ` SeerLite via Guix-patches via
2022-03-16 14:16 ` [bug#54221] [PATCH 0/4] vim: Detect plugins via search paths Ludovic Courtès
2022-05-13 2:34 ` seerlite--- via Guix-patches via
2022-05-19 1:11 ` [bug#54221] [PATCH v4 2/2] gnu: neovim: Search and use installed plugins, like vim SeerLite via Guix-patches via
2022-03-02 13:17 ` SeerLite via Guix-patches via [this message]
2022-03-02 18:40 ` [bug#54221] [PATCH 4/4] gnu: neovim: Update package style Maxime Devos
2022-03-03 17:36 ` SeerLite via Guix-patches via
2022-03-02 18:33 ` [bug#54221] [PATCH 1/4] gnu: vim: Use native-search-paths to search for plugins Maxime Devos
2022-05-13 2:17 ` [bug#54221] [PATCH v2 1/2] " SeerLite via Guix-patches via
2022-05-13 2:17 ` [bug#54221] [PATCH v2 2/2] gnu: neovim: Search and use installed plugins, like vim SeerLite via Guix-patches via
2022-05-19 0:50 ` [bug#54221] [PATCH v3 1/2] gnu: vim: Use native-search-paths to search for plugins SeerLite via Guix-patches via
2022-05-19 0:50 ` [bug#54221] [PATCH v3 2/2] gnu: neovim: Search and use installed plugins, like vim SeerLite via Guix-patches via
2022-05-19 1:08 ` [bug#54221] [PATCH v4 1/2] gnu: vim: Use native-search-paths to search for plugins SeerLite via Guix-patches via
2022-05-19 1:08 ` [bug#54221] [PATCH v4 2/2] gnu: neovim: Search and use installed plugins, like vim SeerLite via Guix-patches via
2022-05-19 1:14 ` [bug#54221] [PATCH v5 1/2] gnu: vim: Use native-search-paths to search for plugins SeerLite via Guix-patches via
2022-05-19 1:14 ` [bug#54221] [PATCH v5 2/2] gnu: neovim: Search and use installed plugins, like vim SeerLite via Guix-patches via
2022-05-19 1:15 ` SeerLite via Guix-patches via
2022-05-24 0:41 ` [bug#54221] [PATCH v6 1/2] gnu: vim: Use native-search-paths to search for plugins SeerLite via Guix-patches via
2022-05-24 0:41 ` [bug#54221] [PATCH v6 2/2] gnu: neovim: Search and use installed plugins, like vim SeerLite via Guix-patches via
2022-05-24 1:52 ` [bug#54221] [PATCH v6 1/2] gnu: vim: Use native-search-paths to search for plugins SeerLite via Guix-patches via
2023-02-22 20:07 ` [bug#54221] [PATCH " SeerLite via Guix-patches via
2023-02-22 20:07 ` [bug#54221] [PATCH 2/2] gnu: neovim: Search and use installed plugins, like vim SeerLite via Guix-patches via
2023-08-05 12:34 ` Liliana Marie Prikler
2023-08-05 12:28 ` [bug#54221] [PATCH 1/2] gnu: vim: Use native-search-paths to search for plugins Liliana Marie Prikler
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=0ee8ec7a501cf53dc1b70b0ba21f72c0f3dc2d58.1646227054.git.seerlite@nixnet.email \
--to=guix-patches@gnu.org \
--cc=54221@debbugs.gnu.org \
--cc=seerlite@nixnet.email \
/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).