nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: neovim: Update to 0.4.2. 

* gnu/packages/vim.scm (neovim): Update to 0.4.2.
[arguments]: Remove "patch-tic" phase; add "lua-luv" to "set-lua-paths" phase.
[inputs]: Add lua5.1-luv.
This commit is contained in:
Ricardo Wurmus 2019-09-16 12:25:30 +02:00
parent 9ad3d67981
commit 518fd3b659
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/vim.scm
View File

@ -735,7 +735,7 @@ are detected, the user is notified.")))
(define-public neovim (define-public neovim
(package (package
(name "neovim") (name "neovim")
(version "0.3.7") (version "0.4.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -745,7 +745,7 @@ are detected, the user is notified.")))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1j6w5jvq5v7kf7diad91qs1acr427nidnk9s24yyrz0hwdd1c2lh")))) "13w446plvgl219lhj29jyimhiqvs1y1byrz4qpdmxgyddmx9xqss"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:modules ((srfi srfi-26) `(#:modules ((srfi srfi-26)
@ -754,13 +754,6 @@ are detected, the user is notified.")))
#:configure-flags '("-DPREFER_LUA:BOOL=YES") #:configure-flags '("-DPREFER_LUA:BOOL=YES")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; TODO: remove 'patch-tic on update
;; see: https://github.com/neovim/neovim/issues/9687
(add-after 'unpack 'patch-tic
(lambda _
(substitute* "src/nvim/tui/tui.c"
(("value != NULL") "value != NULL && value != (char *)-1"))
#t))
(add-after 'unpack 'set-lua-paths (add-after 'unpack 'set-lua-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((lua-version "5.1") (let* ((lua-version "5.1")
@ -774,6 +767,7 @@ are detected, the user is notified.")))
(string-append path "/?.lua;" path "/?/?.lua")))) (string-append path "/?.lua;" path "/?/?.lua"))))
(lua-inputs (map (cute assoc-ref %build-inputs <>) (lua-inputs (map (cute assoc-ref %build-inputs <>)
'("lua" '("lua"
"lua-luv"
"lua-lpeg" "lua-lpeg"
"lua-bitop" "lua-bitop"
"lua-libmpack")))) "lua-libmpack"))))
@ -791,6 +785,7 @@ are detected, the user is notified.")))
("jemalloc" ,jemalloc) ("jemalloc" ,jemalloc)
("libiconv" ,libiconv) ("libiconv" ,libiconv)
("lua" ,lua-5.1) ("lua" ,lua-5.1)
("lua-luv" ,lua5.1-luv)
("lua-lpeg" ,lua5.1-lpeg) ("lua-lpeg" ,lua5.1-lpeg)
("lua-bitop" ,lua5.1-bitop) ("lua-bitop" ,lua5.1-bitop)
("lua-libmpack" ,lua5.1-libmpack))) ("lua-libmpack" ,lua5.1-libmpack)))