From c096071492e89d5c8d45e29bc8850d2d9eb6fa12 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Nov 2020 18:31:52 +0100 Subject: gnu: vim: Update to 8.2.2067. * gnu/packages/vim.scm (vim): Update to 8.2.2067. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index cda1e144ec..baf6ca91cf 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-public vim (package (name "vim") - (version "8.2.2017") + (version "8.2.2067") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0ad0c4wv8zf28wns06k82c19rs63ilsphnglajhgw5j2a1aqplyn")))) + "02cd953h69k9klrcwi756namwg39ka7if9ccc399ihb1l5f3kr66")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit 1.4.1 From 27cf23874402f7132df8bb84a5501ae88abb240a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 7 Dec 2020 12:32:49 +0200 Subject: Revert "gnu: vim: Run more tests." This reverts commit 17a53aec7a6a7608bd01841ca2058bfe1500c453. This breaks building vim on ARM architectures. --- gnu/packages/vim.scm | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index baf6ca91cf..81d5ab00c9 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -121,36 +121,30 @@ (substitute* "src/testdir/test_swap.vim" (("if !IsRoot\\(\\)") "if 0")) - ;; These tests compares output against a golden ‘…/|b|i|n|/|s|h…’ + ;; These tests check how the terminal looks after executing some + ;; actions. The path of the bash binary is shown, which results in + ;; a difference being detected. Patching the expected result is + ;; non-trivial due to the special format used, so skip the test. + (substitute* "src/testdir/test_terminal.vim" + ((".*Test_terminal_postponed_scrollback.*" line) + (string-append line "return\n"))) + (substitute* "src/testdir/test_popupwin.vim" + ((".*Test_popup_drag_termwin.*" line) + (string-append line "return\n"))) + + ;; This test compares output against a golden ‘…/|b|i|n|/|s|h…’ ;; literal. We need to match that and substitute a similarly ;; ‘spliced’ path to ‘sh’ in the store, truncated to the last - ;; 44 (spliced: 88) or so characters. - ;; Two of the tests we simply skip instead of patching the screen dump. - (substitute* "src/testdir/test_popupwin.vim" - ((".*Test_popupwin_term_0[1|2].*") "")) - ;; We replace the external program call (!) with a scroll-back (<) - ;; symbol and blindly fix some other differences based on error output. + ;; 44 (spliced: 88) characters. (let ((splice (lambda (s separator) (string-join (map string (string->list s)) separator)))) (substitute* "src/testdir/dumps/Test_terminal_from_cmd.dump" (((splice "/bin/sh" "\\|")) (splice (string-take-right (which "sh") 44) "|")) + ;; Blindly fix some other differences based on error output. (("^\\|!") "|<") - (("@37") "")) - (substitute* '("src/testdir/dumps/Test_terminal_scrollback_1.dump" - "src/testdir/dumps/Test_terminal_scrollback_2.dump") - (((splice "/bin/sh" "\\|")) - (splice (string-take-right (which "sh") 61) "|")) - (("^\\|!") "|<") - ((" @55") " @1")) - (substitute* '("src/testdir/dumps/Test_terminal_scrollback_3.dump" - "src/testdir/dumps/Test_popupwin_term_03.dump" - "src/testdir/dumps/Test_popupwin_term_04.dump") - (((splice "/bin/sh" "\\|")) - (splice (string-take-right (which "sh") 62) "|")) - (("^\\|!") "|<") - (("\\]\\| @56") "]| @1"))) + (("@37") ""))) #t))))) (inputs `(("gawk" ,gawk) -- cgit 1.4.1 From 53b51b44fd2dd4f56792ea4fc31dac55dd9558e4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 18 Sep 2020 18:25:06 +0300 Subject: gnu: vim: Automatically find vim plugins. * gnu/packages/vim.scm (vim)[arguments]: Add new 'install-guix.vim phase to install vendor specific vimrc. * gnu/packages/aux-files/guix.vim: New file. * Makefile.am (AUX_FILES): Register it. --- Makefile.am | 1 + gnu/packages/aux-files/guix.vim | 7 +++++++ gnu/packages/vim.scm | 10 +++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/aux-files/guix.vim (limited to 'gnu/packages/vim.scm') diff --git a/Makefile.am b/Makefile.am index 1b1360fe4c..e0ee65fcce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -356,6 +356,7 @@ dist_noinst_DATA = \ AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ + gnu/packages/aux-files/guix.vim \ gnu/packages/aux-files/linux-libre/5.10-arm.conf \ gnu/packages/aux-files/linux-libre/5.10-arm64.conf \ gnu/packages/aux-files/linux-libre/5.10-i686.conf \ diff --git a/gnu/packages/aux-files/guix.vim b/gnu/packages/aux-files/guix.vim new file mode 100644 index 0000000000..7dc359e52b --- /dev/null +++ b/gnu/packages/aux-files/guix.vim @@ -0,0 +1,7 @@ +" This appends all of the vim plugins to the end of Vim's runtimepath. +for directory in ["/run/current-system/profile", $HOME . "/.guix-profile", $GUIX_PROFILE, $GUIX_ENVIRONMENT] + let vimplugins = directory . "/share/vim/vimfiles" + if isdirectory(vimplugins) + let &rtp = join([&rtp,vimplugins], ',') + endif +endfor diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 81d5ab00c9..32a668a1c0 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -145,7 +145,14 @@ ;; Blindly fix some other differences based on error output. (("^\\|!") "|<") (("@37") ""))) - #t))))) + #t)) + (add-after 'install 'install-guix.vim + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((vimdir (string-append (assoc-ref outputs "out") "/share/vim"))) + (mkdir-p vimdir) + (copy-file (assoc-ref inputs "guix.vim") + (string-append vimdir "/vimrc")) + #t)))))) (inputs `(("gawk" ,gawk) ("ncurses" ,ncurses) @@ -153,6 +160,7 @@ ("tcsh" ,tcsh))) ; For runtime/tools/vim32 (native-inputs `(("libtool" ,libtool) + ("guix.vim" ,(search-auxiliary-file "guix.vim")) ;; For tests. ("tzdata" ,tzdata-for-tests))) -- cgit 1.4.1 From f3c568d3f1607a3a4269554e8711d93163c400ca Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 19 Dec 2020 18:39:22 -0500 Subject: gnu: python2-pynvim: Remove package. * gnu/packages/vim.scm (python2-pynvim): Remove variable. --- gnu/packages/vim.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 32a668a1c0..da4404e23c 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -816,9 +816,6 @@ also works as a library for connecting to and scripting neovim processes through its msgpack-rpc API.") (license license:asl2.0))) -(define-public python2-pynvim - (package-with-python2 python-pynvim)) - (define-public vim-guix-vim (package (name "vim-guix-vim") -- cgit 1.4.1 From 4a0a4533920c11bf4ddb8c06bee3c2720fa811df Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Jan 2021 09:47:38 +0200 Subject: gnu: vim: Skip terminal screen-dump tests. Even with careful substitutions these tests often break on other architectures anyway. * gnu/packages/vim.scm (vim)[arguments]: Adjust skip-or-fix-failing-tests to skip another terminal screen-dump test. --- gnu/packages/vim.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index da4404e23c..3e120fac17 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -126,25 +126,13 @@ ;; a difference being detected. Patching the expected result is ;; non-trivial due to the special format used, so skip the test. (substitute* "src/testdir/test_terminal.vim" + ((".*Test_open_term_from_cmd.*" line) + (string-append line "return\n")) ((".*Test_terminal_postponed_scrollback.*" line) (string-append line "return\n"))) (substitute* "src/testdir/test_popupwin.vim" ((".*Test_popup_drag_termwin.*" line) (string-append line "return\n"))) - - ;; This test compares output against a golden ‘…/|b|i|n|/|s|h…’ - ;; literal. We need to match that and substitute a similarly - ;; ‘spliced’ path to ‘sh’ in the store, truncated to the last - ;; 44 (spliced: 88) characters. - (let ((splice (lambda (s separator) - (string-join (map string (string->list s)) - separator)))) - (substitute* "src/testdir/dumps/Test_terminal_from_cmd.dump" - (((splice "/bin/sh" "\\|")) - (splice (string-take-right (which "sh") 44) "|")) - ;; Blindly fix some other differences based on error output. - (("^\\|!") "|<") - (("@37") ""))) #t)) (add-after 'install 'install-guix.vim (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit 1.4.1