me/guix
Archived
1
0
Fork 0
Code Activity

gnu: vim: Update to 8.2.3995.

Browse source 
* gnu/packages/vim.scm (vim): Update to 8.2.3995.
[arguments]: Remove trailing #t from phases.
(vim-full): Remove comment about package reliably building.
This commit is contained in:
Efraim Flashner 2022-01-09 10:56:15 +02:00
parent c1529ebceb
commit ba17cf41e8
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/vim.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
@ -75,7 +75,7 @@
(define-public vim (define-public vim
(package (package
(name "vim") (name "vim")
(version "8.2.3487") (version "8.2.3995")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -84,7 +84,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1s09jvr1vv9zjk352vbfidfy5fidbf83kz2vk0kk6zv24j1yck24")))) "1aqrywyry4vxf1x7mk5g1k5k6md38bnjb6f778hmk8ahx26mpqpb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -106,8 +106,7 @@
"src/testdir/test_terminal2.vim") "src/testdir/test_terminal2.vim")
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
(substitute* "src/testdir/test_autocmd.vim" (substitute* "src/testdir/test_autocmd.vim"
(("/bin/kill") (which "kill"))) (("/bin/kill") (which "kill")))))
#t))
(add-before 'check 'set-environment-variables (add-before 'check 'set-environment-variables
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; One of the tests tests timezone-dependent functions. ;; One of the tests tests timezone-dependent functions.
@ -115,8 +114,7 @@
(search-input-directory inputs "share/zoneinfo")) (search-input-directory inputs "share/zoneinfo"))
;; Make sure the TERM environment variable is set for the tests ;; Make sure the TERM environment variable is set for the tests
(setenv "TERM" "xterm") (setenv "TERM" "xterm")))
#t))
(add-before 'check 'skip-or-fix-failing-tests (add-before 'check 'skip-or-fix-failing-tests
(lambda _ (lambda _
;; This test assumes that PID 1 is run as root and that the user ;; This test assumes that PID 1 is run as root and that the user
@ -141,8 +139,7 @@
(string-append line "return\n"))) (string-append line "return\n")))
(substitute* "src/testdir/test_popupwin.vim" (substitute* "src/testdir/test_popupwin.vim"
((".*Test_popup_drag_termwin.*" line) ((".*Test_popup_drag_termwin.*" line)
(string-append line "return\n"))) (string-append line "return\n")))))
#t))
(add-before 'install 'fix-installman.sh (add-before 'install 'fix-installman.sh
(lambda _ (lambda _
(substitute* "src/installman.sh" (substitute* "src/installman.sh"
@ -153,8 +150,7 @@
(let ((vimdir (string-append (assoc-ref outputs "out") "/share/vim"))) (let ((vimdir (string-append (assoc-ref outputs "out") "/share/vim")))
(mkdir-p vimdir) (mkdir-p vimdir)
(copy-file (assoc-ref inputs "guix.vim") (copy-file (assoc-ref inputs "guix.vim")
(string-append vimdir "/vimrc")) (string-append vimdir "/vimrc"))))))))
#t))))))
(inputs (inputs
(list gawk ncurses perl tcsh)) ; For runtime/tools/vim32 (list gawk ncurses perl tcsh)) ; For runtime/tools/vim32
(native-inputs (native-inputs
@ -204,9 +200,6 @@ with the editor vim.")))
(define-public vim-full (define-public vim-full
(package (package
;; This package should share its source with Vim, but it doesn't
;; build reliably, and we want to keep Vim up to date due to the
;; frequency of important bug fixes.
(inherit vim) (inherit vim)
(name "vim-full") (name "vim-full")
(arguments (arguments