me
/
guix
Archived
1
0
Fork 0
Code

gnu: vim: Update to 8.2.1145. 

* gnu/packages/vim.scm (vim): Update to 8.2.1145.
  [arguments]: Patch the terminal2 test too, as it has been split from
  test_terminal. Make the name of the phase more accurate.
  (vim-full)[arguments]: Remove the skip-test87 phase, as the test no
  longer exists and its successor passes.
Jakub Kądziołka 2020-07-06 19:15:06 +02:00
parent 28f7ef86ce
commit a5dbc07d38
No known key found for this signature in database
GPG Key ID: E315A75846131564
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
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.1101") (version "8.2.1145")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -79,21 +79,22 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"170k855vscixnk6rz01i3k22crjiz8b2h83fnm2b2ccha0jyn9mf")))) "01z5hgi7m8d63gl1fgfn4p9rsdaqbl5xn4vr247nbxjq5x5hrs7a"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:parallel-tests? #f #:parallel-tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'configure 'patch-config-files (add-after 'configure 'patch-absolute-paths
(lambda _ (lambda _
(substitute* "runtime/tools/mve.awk" (substitute* "runtime/tools/mve.awk"
(("/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_system.vim"
"src/testdir/test_terminal.vim") "src/testdir/test_terminal.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")))
@ -214,19 +215,6 @@ with the editor vim.")))
,@(substitute-keyword-arguments (package-arguments vim) ,@(substitute-keyword-arguments (package-arguments vim)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-before 'check 'skip-test87
;; This test fails for unknown reasons after switching
;; to a git checkout.
(lambda _
(delete-file "src/testdir/test87.ok")
(delete-file "src/testdir/test87.in")
(substitute* '("src/Makefile"
"src/testdir/Make_vms.mms")
(("test87") ""))
(substitute* "src/testdir/Make_all.mak"
(("test86.out \\\\") "test86")
(("test87.out") ""))
#t))
(add-before 'check 'start-xserver (add-before 'check 'start-xserver
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Some tests require an X server, but does not start one. ;; Some tests require an X server, but does not start one.