amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: vim: Update to 8.2.4912.

Browse source 
* gnu/packages/vim.scm (vim): Update to 8.2.4912.
[arguments]: Adjust 'patch-absolute-paths phase for changes in code.
Adjust 'skip-or-fix-failing-tests phase to allow newly passing test.
This commit is contained in:
Efraim Flashner 2022-05-08 12:03:18 +03:00
parent d2c5754ef1
commit 04d09bc372
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/vim.scm
View file

@ -77,7 +77,7 @@
(define-public vim (define-public vim
(package (package
(name "vim") (name "vim")
(version "8.2.4701") (version "8.2.4912")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -86,7 +86,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0yqqzai3ihfjjjjmn50pxlcqllpkmlrf5z59ma5rn0gv8wwwdw7h")))) "0wcvwmybkw76ha58idrq6pf4gxk14wbw1f8cwqs0slvkfdc8jyya"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -95,12 +95,11 @@
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'configure 'patch-absolute-paths (add-after 'configure 'patch-absolute-paths
(lambda _ (lambda _
(substitute* "runtime/tools/mve.awk"
(("/usr/bin/nawk") (which "gawk")))
(substitute* '("src/testdir/Makefile" (substitute* '("src/testdir/Makefile"
"src/testdir/test_filetype.vim" "src/testdir/test_filetype.vim"
"src/testdir/test_normal.vim" "src/testdir/test_normal.vim"
"src/testdir/test_popupwin.vim" "src/testdir/test_popupwin.vim"
"src/testdir/test_prompt_buffer.vim"
"src/testdir/test_shell.vim" "src/testdir/test_shell.vim"
"src/testdir/test_suspend.vim" "src/testdir/test_suspend.vim"
"src/testdir/test_terminal.vim" "src/testdir/test_terminal.vim"
@ -123,15 +122,6 @@
(substitute* "src/testdir/test_writefile.vim" (substitute* "src/testdir/test_writefile.vim"
(("!has\\('bsd'\\)") "0"))) (("!has\\('bsd'\\)") "0")))
;; This test assumes that PID 1 is run as root and that the user
;; running the test suite does not have permission to kill(1, 0)
;; it. This is not true in the build container, where both PID 1
;; and the test suite are run as the same user. Skip the test.
;; An alternative fix would be to patch the PID used to a random
;; 32-bit value and hope it never shows up in the test environment.
(substitute* "src/testdir/test_swap.vim"
(("if !IsRoot\\(\\)") "if 0"))
;; These tests check how the terminal looks after executing some ;; These tests check 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