[bug#30110] [PATCH] gnu: vim: Update to 8.0.1428.

[bug#30110] [PATCH] gnu: vim: Update to 8.0.1428.

[Tobias Geerinckx-Rice]

* gnu/packages/vim.scm (vim): Update to 8.0.1428.
[arguments]: Add ‘patch-failing-test’ phase.
---

Guix,

I guess (you may take that quite literally) there's something about our
build environment that makes mch_fopen("/dev/stdout") fail. Manually
running

  :call writefile(foo, "/dev/stdout")

properly gunks up my terminal, so I've just disabled the test. Fixed!

Submitted in case anyone has a better solution.

Kind regards,

T G-R

 gnu/packages/vim.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 85ccf9c9d..32f1e1ca5 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)
-- 
2.15.0

[bug#30110] [PATCH] gnu: vim: Update to 8.0.1428.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 556 bytes --]

On Sun, Jan 14, 2018 at 01:15:16PM +0100, Tobias Geerinckx-Rice wrote:
> * gnu/packages/vim.scm (vim): Update to 8.0.1428.
> [arguments]: Add ‘patch-failing-test’ phase.
> ---
> 
> Guix,
> 
> I guess (you may take that quite literally) there's something about our
> build environment that makes mch_fopen("/dev/stdout") fail. Manually
> running
> 
>   :call writefile(foo, "/dev/stdout")
> 
> properly gunks up my terminal, so I've just disabled the test. Fixed!
> 
> Submitted in case anyone has a better solution.

LGTM, thank you!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#30110: [PATCH] gnu: vim: Update to 8.0.1428.

[Tobias Geerinckx-Rice]

Pushed as af60a20034d5fb2c81afbb58fbb759a89798b4d4.

Thanks!

T G-R