me
/
guix
Archived
1
0
Fork 0
Code

gnu: vim: Update to 8.2.1101. 

* gnu/packages/vim.scm (vim): Update to 8.2.1101. [arguments]: In
'patch-config-files patch more shell calls. Rename custom 'set-TZDIR
phase to 'set-environment-variables phase and also set TERM. Adjust
'skip-failing-tests to skip more tests.
Efraim Flashner 2020-07-01 12:10:40 +03:00
parent d277c00ec9
commit 4e133f4fe4
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/vim.scm
View File

@ -70,7 +70,7 @@
(define-public vim (define-public vim
(package (package
(name "vim") (name "vim")
(version "8.2.0411") (version "8.2.1101")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -79,7 +79,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0idjbf15yqk5jz2dqbh2lzj7glxcwn1jl5pp9kk908ps02vzqyai")))) "170k855vscixnk6rz01i3k22crjiz8b2h83fnm2b2ccha0jyn9mf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -92,15 +92,21 @@
(("/usr/bin/nawk") (which "gawk"))) (("/usr/bin/nawk") (which "gawk")))
(substitute* '("src/testdir/Makefile" (substitute* '("src/testdir/Makefile"
"src/testdir/test_normal.vim" "src/testdir/test_normal.vim"
"src/testdir/test_system.vim"
"src/testdir/test_terminal.vim") "src/testdir/test_terminal.vim")
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
(substitute* "src/testdir/test_autocmd.vim"
(("/bin/kill") (which "kill")))
#t)) #t))
(add-before 'check 'set-TZDIR (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.
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata") (string-append (assoc-ref inputs "tzdata")
"/share/zoneinfo")) "/share/zoneinfo"))
;; Make sure the TERM environment variable is set for the tests
(setenv "TERM" "xterm")
#t)) #t))
(add-before 'check 'skip-failing-tests (add-before 'check 'skip-failing-tests
(lambda _ (lambda _
@ -113,6 +119,14 @@
(substitute* "src/testdir/test_swap.vim" (substitute* "src/testdir/test_swap.vim"
(("if !IsRoot\\(\\)") "if 0")) (("if !IsRoot\\(\\)") "if 0"))
;; These tests fail on upstream's CI on FreeBSD because they are
;; run as root. They fail for us because PID 1 and the test suite
;; are run by the same user.
(substitute* '("src/testdir/test_backup.vim"
"src/testdir/test_writefile.vim")
(("CheckNotBSD") "throw 'Skipped: this test fails on Guix'")
(("'bsd'") "'unix'"))
;; This test checks how the terminal looks after executing some ;; This test checks how the terminal looks after executing some
;; actions. The path of the bash binary is shown, which results in ;; actions. The path of the bash binary is shown, which results in
;; a difference being detected. Patching the expected result is ;; a difference being detected. Patching the expected result is