aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/vim.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-01-19 23:59:20 -0500
committerMark H Weaver <mhw@netris.org>2018-01-19 23:59:20 -0500
commite074a655dd6497daafbd62737e3b63f3d5aa7985 (patch)
tree2b198ba5c664cdd58e155f3c0113d1cebde0fc91 /gnu/packages/vim.scm
parent6d7b26a39faf42c37f15dc64a30a77e5e194ea23 (diff)
parentccb5cac17be98aaa9c3225605d6170c675d8e8e6 (diff)
downloadguix-e074a655dd6497daafbd62737e3b63f3d5aa7985.tar
guix-e074a655dd6497daafbd62737e3b63f3d5aa7985.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/vim.scm')
-rw-r--r--gnu/packages/vim.scm12
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 85ccf9c9d1..32f1e1ca54 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -60,7 +61,7 @@
(define-public vim
(package
(name "vim")
- (version "8.0.1300")
+ (version "8.0.1428")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/vim/vim/archive/v"
@@ -68,7 +69,7 @@
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "19w1rxmswsr19wng74f1iwwgd5wpx1hhvprjy1i0k41nply5h3h8"))))
+ "08hzx843cxr5b2llc3332wxpgh3gjrs7jgd6s3sdrxnvg0s0y7s8"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@@ -82,6 +83,13 @@
(substitute* '("src/testdir/Makefile"
"src/testdir/test_normal.vim")
(("/bin/sh") (which "sh")))
+ #t))
+ (add-before 'check 'patch-failing-test
+ (lambda _
+ ;; XXX A single test fails with “Can't create file /dev/stdout” (at
+ ;; Test_writefile_sync_dev_stdout line 5) while /dev/stdout exists.
+ (substitute* "src/testdir/test_writefile.vim"
+ (("/dev/stdout") "a-regular-file"))
#t)))))
(inputs
`(("gawk" ,gawk)