diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-05-22 14:56:50 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-05-22 14:56:50 +0200 |
| commit | e4cddbbcac752090585baed5b15e2eb4af713284 (patch) | |
| tree | 7a103d8d96beeb4ae5a28b1f575a70a0b6514501 /gnu/packages/vim.scm | |
| parent | 98bb983ca7ea2b393021bfee155a72b1c6183f72 (diff) | |
| parent | 74297231be34afbd9d0182651a75f40c60973ec3 (diff) | |
| download | guix-e4cddbbcac752090585baed5b15e2eb4af713284.tar guix-e4cddbbcac752090585baed5b15e2eb4af713284.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/vim.scm')
| -rw-r--r-- | gnu/packages/vim.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 697c7dedc7..27c0b0da9c 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -60,7 +60,7 @@ (define-public vim (package (name "vim") - (version "8.0.0566") + (version "8.0.0600") (source (origin (method url-fetch) (uri (string-append "https://github.com/vim/vim/archive/v" @@ -68,7 +68,7 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0qq9pj8391sikzaahlqi289l5wdkbvsdhz8qb6np268yqizpg4p2")))) + "1ifaj0lfzqn06snkcd83l58m9r6lg7lk3wspx71k5ycvypyfi67s")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -138,6 +138,10 @@ configuration files.") ;; https://github.com/vim/vim/issues/1460 (substitute* "src/testdir/test_cmdline.vim" (("call assert_equal\\(.+getcmd.+\\(\\)\\)") "")) + ;; FIXME: This test broke after GCC-5 core-updates merge. + ;; "Test_system_exmode line 7: Expected '0' but got '/'" + (substitute* "src/testdir/test_system.vim" + (("call assert_equal\\('0', a\\[0\\]\\)") "")) #t)) (add-before 'check 'start-xserver (lambda* (#:key inputs #:allow-other-keys) |