diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-02-20 17:36:56 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-02-20 17:36:56 +0100 |
| commit | 7f69459aca16756f35f08049c64a1bd77d23f33e (patch) | |
| tree | 1d267fb62feab89de5d97582672540cbaa37392c /gnu/packages/vim.scm | |
| parent | 4a82722a658220ec1e10f9f2d5d77407d38db90e (diff) | |
| parent | b1989c12501e880afab62d3ff961791906fef350 (diff) | |
| download | guix-7f69459aca16756f35f08049c64a1bd77d23f33e.tar guix-7f69459aca16756f35f08049c64a1bd77d23f33e.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/vim.scm')
| -rw-r--r-- | gnu/packages/vim.scm | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 85ccf9c9d1..79bd920436 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -1,9 +1,10 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> -;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; 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) @@ -709,7 +717,7 @@ refactor Vim in order to: (define-public vifm (package (name "vifm") - (version "0.9") + (version "0.9.1") (source (origin (method url-fetch) @@ -720,7 +728,7 @@ refactor Vim in order to: "vifm-" version ".tar.bz2"))) (sha256 (base32 - "1zd72vcgir3g9rhs2iyca13qf5fc0b1f22y20f5gy92c3sfwj45b")))) + "1cz7vjjmghgdxd1lvsdwv85gvx4kz8idq14qijpwkpfrf2va9f98")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-build-timestamp") @@ -750,12 +758,12 @@ refactor Vim in order to: (delete-file-recursively (string-append vifm "/vim"))) #t))))) (native-inputs - `(("groff" ,groff) ; for the documentation - ("perl" ,perl))) + `(("groff" ,groff))) ; for the documentation (inputs `(("libx11" ,libx11) - ("ncurses" ,ncurses))) - (home-page "http://vifm.info/") + ("ncurses" ,ncurses) + ("perl" ,perl))) + (home-page "https://vifm.info/") (synopsis "Flexible vi-like file manager using ncurses") (description "Vifm is a file manager providing a @command{vi}-like usage experience. It has similar keybindings and modes (e.g. normal, command line, |