From a3ab43f49ac2dbda102e4c0e6b0a87da358793c0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 19 Oct 2020 21:43:10 +0200 Subject: gnu: vim: Update to 8.2.1864. * gnu/packages/vim.scm (vim): Update to 8.2.1864. --- 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 05136981ea..99f2bf28e4 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-public vim (package (name "vim") - (version "8.2.1852") + (version "8.2.1864") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0nvcvvig5fc45smf4kh71jqyqafffgxzaizwqknk0h9vzl4k4h57")))) + "08pczy191gac9z8kv6z1yz55var2sqf8p55afxq467k9czpdzclz")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 2513e4644037e616d78665767f8af4e185d9471d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 25 Oct 2020 15:33:37 +0200 Subject: gnu: vim: Update to 8.2.1900. * gnu/packages/vim.scm (vim): Update to 8.2.1900. [arguments]: Remove 'fix-installman phase. --- gnu/packages/vim.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 99f2bf28e4..b006eb4212 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-public vim (package (name "vim") - (version "8.2.1864") + (version "8.2.1900") (source (origin (method git-fetch) (uri (git-reference @@ -79,18 +79,13 @@ (file-name (git-file-name name version)) (sha256 (base32 - "08pczy191gac9z8kv6z1yz55var2sqf8p55afxq467k9czpdzclz")))) + "0fr11sl8xm08jy63f20370q5ipkccpc45d6adq4fp08f845vs05s")))) (build-system gnu-build-system) (arguments `(#:test-target "test" #:parallel-tests? #f #:phases (modify-phases %standard-phases - (add-after 'patch-source-shebangs 'fix-installman - (lambda _ - (substitute* "src/installman.sh" - ((" /bin/sh") (which "sh"))) - #t)) (add-after 'configure 'patch-absolute-paths (lambda _ (substitute* "runtime/tools/mve.awk" -- cgit v1.2.3 From 6b0e75bb3f565dfb9ffa084fb232c0b596adbb7e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Nov 2020 11:25:52 +0200 Subject: gnu: vim: Update to 8.2.1947. * gnu/packages/vim.scm (vim): Update to 8.2.1947. --- 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 b006eb4212..c574b26f4e 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-public vim (package (name "vim") - (version "8.2.1900") + (version "8.2.1947") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0fr11sl8xm08jy63f20370q5ipkccpc45d6adq4fp08f845vs05s")))) + "1cl83phzsy1mqsgbqyds10644jcfkwk2pn6vx6s6l7vw52hh5nkc")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 2c734548fd7181f038252fbca36a06c9418cca87 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 7 Nov 2020 15:34:49 +0100 Subject: gnu: vim: Update to 8.2.1964. * gnu/packages/vim.scm (vim): Update to 8.2.1964. --- 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 c574b26f4e..87539e353f 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-public vim (package (name "vim") - (version "8.2.1947") + (version "8.2.1964") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1cl83phzsy1mqsgbqyds10644jcfkwk2pn6vx6s6l7vw52hh5nkc")))) + "0rhx93xq5gk7lgxnm0h0lnwl6zgifcnl0c9k0f4fqb6cx81ihp4q")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From fbf3f47f854549c060352281714f6e674901feb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Nov 2020 21:29:11 +0100 Subject: gnu: vim: Update to 8.2.1971. * gnu/packages/vim.scm (vim): Update to 8.2.1971. --- 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 87539e353f..8f9aca8f58 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-public vim (package (name "vim") - (version "8.2.1964") + (version "8.2.1971") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0rhx93xq5gk7lgxnm0h0lnwl6zgifcnl0c9k0f4fqb6cx81ihp4q")))) + "00svmci7hqgpj41rpa2lxcp8qgd3p7rpy4bzan1a512b07k35rb7")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 2646b9d6d36d0d268272f4cd9c52ef710eaf1e19 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 01:52:04 +0100 Subject: gnu: vim: Update to 8.2.1980. * gnu/packages/vim.scm (vim): Update to 8.2.1980. --- 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 8f9aca8f58..24bd121345 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-public vim (package (name "vim") - (version "8.2.1971") + (version "8.2.1980") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "00svmci7hqgpj41rpa2lxcp8qgd3p7rpy4bzan1a512b07k35rb7")))) + "1l1bb4lhlivgvj4jaxkibdkcg6rh1gk80d6ni41kphyrir7xahja")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From ce18d88347de4239f5c8c7f8e547aff8db83203f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Nov 2020 20:34:01 +0200 Subject: gnu: vim-guix-vim: Update to 0.1.1. * gnu/packages/vim.scm (vim-guix-vim): Update to 0.1.1. --- 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 24bd121345..236bb97cbe 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -800,7 +800,7 @@ through its msgpack-rpc API.") (define-public vim-guix-vim (package (name "vim-guix-vim") - (version "0.1") + (version "0.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -809,7 +809,7 @@ through its msgpack-rpc API.") (file-name (git-file-name name version)) (sha256 (base32 - "1f8h8m96fqh3f9hy87spgh9kdqzyxl11n9s3rywvyq5xhn489bnk")))) + "10bfy0dgwizxr56b4272b7sqajpr6lnz332pzx055dis2zzjap8z")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit v1.2.3 From 4bc0fc4eefcca179709c49cdc211c22480ef8571 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Nov 2020 18:35:13 +0100 Subject: gnu: vim: Update to 8.2.2000. * gnu/packages/vim.scm (vim): Update to 8.2.2000. --- 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 236bb97cbe..c2115b15f5 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-public vim (package (name "vim") - (version "8.2.1980") + (version "8.2.2000") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1l1bb4lhlivgvj4jaxkibdkcg6rh1gk80d6ni41kphyrir7xahja")))) + "126ajnvx6857gy8wyy9nya6vzfw60am0qy0swwc3vds3f471xyhp")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 5a717c55267c7ffd09445a7e0fb2733a12d2f996 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 20 Nov 2020 00:05:51 +0100 Subject: gnu: vim: Fix a failing test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vim.scm (vim)[arguments]: Rename the ‘skip-failing-tests’ phase to ‘skip-or-fix-failing-tests’. Fix a failing test. --- gnu/packages/vim.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index c2115b15f5..26f2547d18 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -110,7 +110,7 @@ ;; Make sure the TERM environment variable is set for the tests (setenv "TERM" "xterm") #t)) - (add-before 'check 'skip-failing-tests + (add-before 'check 'skip-or-fix-failing-tests (lambda _ ;; This test assumes that PID 1 is run as root and that the user ;; running the test suite does not have permission to kill(1, 0) @@ -131,6 +131,20 @@ (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))))) (inputs `(("gawk" ,gawk) -- cgit v1.2.3 From 14641312a90e036b0be2d57b3a358578fc46540a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 20 Nov 2020 02:25:27 +0100 Subject: gnu: vim: Update to 8.2.2017. * gnu/packages/vim.scm (vim): Update to 8.2.2017. --- 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 26f2547d18..5c6673cf2b 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-public vim (package (name "vim") - (version "8.2.2000") + (version "8.2.2017") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "126ajnvx6857gy8wyy9nya6vzfw60am0qy0swwc3vds3f471xyhp")))) + "0ad0c4wv8zf28wns06k82c19rs63ilsphnglajhgw5j2a1aqplyn")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 17a53aec7a6a7608bd01841ca2058bfe1500c453 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 20 Nov 2020 15:01:56 +0200 Subject: gnu: vim: Run more tests. * gnu/packages/vim.scm (vim)[arguments]: In the custom 'skip-or-fix-failing-tests phase adjust substitutions to skip fewer tests and adjust other test output to patched shebangs. --- gnu/packages/vim.scm | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 5c6673cf2b..cda1e144ec 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -121,30 +121,36 @@ (substitute* "src/testdir/test_swap.vim" (("if !IsRoot\\(\\)") "if 0")) - ;; 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…’ + ;; These tests 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. + ;; 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. (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") ""))) + (("@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"))) #t))))) (inputs `(("gawk" ,gawk) -- cgit v1.2.3