diff options
| author | Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com> | 2022-03-17 10:44:14 -0300 |
|---|---|---|
| committer | Guix Patches Tester <> | 2022-03-17 13:46:19 +0000 |
| commit | 637a84bf0eee661d4f4f096281206e0053818348 (patch) | |
| tree | 89b0a936bc19fb635429c23264b9d8309e4bf70c | |
| parent | 64d88db7f9fb56b19f699bfaf5f8a140514e3f21 (diff) | |
| download | guix-patches-637a84bf0eee661d4f4f096281206e0053818348.tar guix-patches-637a84bf0eee661d4f4f096281206e0053818348.tar.gz | |
gnu: neovim: Update to 0.6.1.
* gnu/packages/vim.scm (neovim): Update to 0.6.1.
Build neovim with LuaJIT in the supported platforms.
| -rw-r--r-- | gnu/packages/vim.scm | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 28944dd640..1d5904935f 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2021 Tissevert <tissevert+guix@marvid.fr> ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com> +;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -661,7 +662,7 @@ are detected, the user is notified."))) (define-public neovim (package (name "neovim") - (version "0.4.4") + (version "0.6.1") (source (origin (method git-fetch) @@ -670,13 +671,20 @@ are detected, the user is notified."))) (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m")))) + (base32 "10p6lg5yv9n6wcwdprwvvi56dfcm4wsj54nm0invyx3mhf7374lx")))) (build-system cmake-build-system) (arguments `(#:modules ((srfi srfi-26) (guix build cmake-build-system) (guix build utils)) - #:configure-flags '("-DPREFER_LUA:BOOL=YES") + #:configure-flags + (list ,@(if (member (or (if (%current-target-system) + (gnu-triplet->nix-system (%current-target-system)) + #f) + (%current-system)) + (package-supported-systems luajit)) + '() + '("-DPREFER_LUA:BOOL=YES"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'set-lua-paths @@ -716,11 +724,19 @@ are detected, the user is notified."))) ("libvterm" ,libvterm) ("unibilium" ,unibilium) ("jemalloc" ,jemalloc) - ("lua" ,lua-5.1) + ("libiconv" ,libiconv) + ("lua" ,(if (member (or (if (%current-target-system) + (gnu-triplet->nix-system (%current-target-system)) + #f) + (%current-system)) + (package-supported-systems luajit)) + luajit + lua-5.1)) ("lua-luv" ,lua5.1-luv) ("lua-lpeg" ,lua5.1-lpeg) ("lua-bitop" ,lua5.1-bitop) - ("lua-libmpack" ,lua5.1-libmpack))) + ("lua-libmpack" ,lua5.1-libmpack) + ("tree-sitter" ,tree-sitter))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) |