diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-02-10 19:07:38 +0100 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-02-11 16:14:44 +0200 |
| commit | d0f31aeeb75371716168b492539623afacd8cf7b (patch) | |
| tree | 76e708668e4d976e3c31af3a899481a8224c1cb5 /gnu/packages | |
| parent | 463fb58fa1a05d58b811bb570ef6d6534be94591 (diff) | |
| download | patches-d0f31aeeb75371716168b492539623afacd8cf7b.tar patches-d0f31aeeb75371716168b492539623afacd8cf7b.tar.gz | |
gnu: vim: Update to 8.2.0236.
* gnu/packages/vim.scm (vim): Update to 8.2.0236.
(vim-full)[arguments]: Add a -lexpat linker argument through
#:make-flags. Add a new phase to skip a test (see comment).
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/vim.scm | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index f130ae4392..1d4a7a3f94 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 HiPhish <hiphish@posteo.de> ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu> -;;; Copyright © 2019 Jakub Kądziołka <kuba@kadziolka.net> +;;; Copyright © 2019, 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,7 +68,7 @@ (define-public vim (package (name "vim") - (version "8.2.0069") + (version "8.2.0236") (source (origin (method git-fetch) (uri (git-reference @@ -77,7 +77,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0kxzfcpv96s1lbx97g6451p1i7yanws5bvzl05jh1ywaqv5f4y7g")))) + "0ixwr7kkxc1cj837v1bbgghkd68gbynfn7pc4rb87ah9sm6bgaz3")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -189,9 +189,20 @@ with the editor vim."))) "--enable-xim" "--disable-selinux" "--enable-gui") + ;; This flag fixes the following error: + ;; .../libpython3.7m.a(pyexpat.o): undefined reference to symbol 'XML_FreeContentModel' + ;; .../libexpat.so.1: error adding symbols: DSO missing from command line + #:make-flags '("LDFLAGS=-lexpat") ,@(substitute-keyword-arguments (package-arguments vim) ((#:phases phases) `(modify-phases ,phases + (add-before 'check 'skip-previewpopup + ;; This test fails when the path to the source is long. See: + ;; https://github.com/vim/vim/issues/5615 + (lambda _ + (substitute* "src/testdir/test_popupwin.vim" + ((".*Test_previewpopup.*" line) + (string-append line "return\n"))))) (add-before 'check 'skip-test87 ;; This test fails for unknown reasons after switching ;; to a git checkout. |