diff options
Diffstat (limited to 'gnu/packages/vim.scm')
| -rw-r--r-- | gnu/packages/vim.scm | 86 |
1 files changed, 53 insertions, 33 deletions
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 1f7a005cb1..6b5eaabf8e 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> -;;; Copyright © 2016-2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016-2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> @@ -15,7 +15,7 @@ ;;; Copyright © 2022, 2023 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com> ;;; Copyright © 2023 Charles Jackson <charles.b.jackson@protonmail.com> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> -;;; Copyright © 2023 Nguyễn Gia Phong <mcsinyx@disroot.org> +;;; Copyright © 2023, 2024 Nguyễn Gia Phong <mcsinyx@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,7 +86,7 @@ (define-public vim (package (name "vim") - (version "9.0.2001") + (version "9.1.0146") (source (origin (method git-fetch) (uri (git-reference @@ -95,7 +95,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1y0xfvndnyfv677gn4mkq0jf5k15mm1dngl96l9j90sp4lbqrszx")))) + "05lz8ai39p9ypk22n7qc7g21868m08pl12sn4028jshx5nxwy2zn")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -116,7 +116,8 @@ (("/bin/sh") (which "sh"))) (substitute* "src/testdir/test_autocmd.vim" (("/bin/kill") (which "kill"))) - (substitute* "src/if_cscope.c" + (substitute* '("runtime/syntax/sh.vim" + "src/if_cscope.c") (("/bin/sh") (search-input-file inputs "/bin/sh"))))) (add-before 'check 'set-environment-variables (lambda* (#:key inputs #:allow-other-keys) @@ -769,7 +770,7 @@ is based on Vim's builtin plugin support.") (define-public neovim (package (name "neovim") - (version "0.9.4") + (version "0.9.5") (source (origin (method git-fetch) (uri (git-reference @@ -778,7 +779,7 @@ is based on Vim's builtin plugin support.") (file-name (git-file-name name version)) (sha256 (base32 - "0wj1p5x88s58f22crdyzwlfiqgnwlqdkbw4wxllf0v5hg16gbnhp")))) + "1j3z7jay0m6g06v04falrzr062g07xr4svbrc3hywlqi2h6rrvk5")))) (build-system cmake-build-system) (arguments (list #:modules @@ -884,6 +885,14 @@ refactor Vim in order to: '(#:tests? #false ;no tests #:phases (modify-phases %standard-phases + (add-after 'unpack 'help-cmake-find-msgpack-c + (lambda _ + ;; Patch the build system so that it can find the modern + ;; 'msgpack-c' named pkg-config file (see: + ;; https://github.com/jeanguyomarch/eovim/issues/73). + (substitute* "cmake/Modules/FindMsgPack.cmake" + (("MSGPACK QUIET msgpack") + "MSGPACK QUIET msgpack-c msgpack")))) (add-after 'configure 'reference-nvim (lambda* (#:key inputs #:allow-other-keys) (let ((nvim (search-input-file inputs "/bin/nvim"))) @@ -894,10 +903,8 @@ refactor Vim in order to: (string-append start nvim)))))) (add-before 'build 'set-home (lambda _ (setenv "HOME" "/tmp")))))) - (native-inputs - (list pkg-config)) - (inputs - (list efl msgpack neovim)) + (native-inputs (list pkg-config)) + (inputs (list efl msgpack-c neovim)) (home-page "https://github.com/jeanguyomarch/eovim/") (synopsis "EFL GUI for Neovim") (description "Graphical Neovim interface based on the @acronym{EFL, Enlightenment @@ -1047,7 +1054,7 @@ a nested nvim process.") (define-public vim-asyncrun (package (name "vim-asyncrun") - (version "2.8.6") + (version "2.12.4") (source (origin (method git-fetch) (uri (git-reference @@ -1056,7 +1063,7 @@ a nested nvim process.") (file-name (git-file-name name version)) (sha256 (base32 - "11zcw0sll6qg6ha0rr6n1cw5v73azvf7ycwn9lgiwa5cj7rrqjf4")))) + "0hyz3bgbwmg85534ab71w2sr6fj94mz498ayn9bvhn4g7y6c951n")))) (build-system vim-build-system) (arguments (list @@ -1068,30 +1075,43 @@ NeoVim) to enable you to run shell commands in background and read output in the quickfix window in realtime.") (license license:expat))) -(define-public vim-dispatch +(define-public neovim-asyncrun (package - (name "vim-dispatch") - (version "1.8") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tpope/vim-dispatch") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1m8b5mn2zqlphzs6xfwykwmghf6p0wabrhpjmh7vav35jgcxc4wl")))) - (build-system vim-build-system) - (arguments - (list #:plugin-name "dispatch")) - (home-page "https://github.com/tpope/vim-dispatch") - (synopsis "Asynchronous build and test dispatcher") - (description "Leverage the power of Vim's compiler plugins without being + (inherit vim-asyncrun) + (name "neovim-asyncrun"))) + +(define-public vim-dispatch + ;; Last release was in June 2019. + (let ((commit "4c695bc052cad2ae6b980aebbe48d046466e27ae") + (revision "1")) + (package + (name "vim-dispatch") + (version (git-version "1.8" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tpope/vim-dispatch") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13c63n7gylny2s84k05cpl4cjn070d3qk6yagxny23yanz29hc15")))) + (build-system vim-build-system) + (arguments + (list #:plugin-name "dispatch")) + (home-page "https://github.com/tpope/vim-dispatch") + (synopsis "Asynchronous build and test dispatcher") + (description "Leverage the power of Vim's compiler plugins without being bound by synchronicity. Kick off builds and test suites using one of several asynchronous adapters (including tmux, screen, and a headless mode), and when the job completes, errors will be loaded and parsed automatically.") - (license license:vim))) + (license license:vim)))) + +(define-public neovim-dispatch + (package + (inherit vim-dispatch) + (name "neovim-dispatch"))) (define-public vim-gemini-vim ;; No releases have been tagged. |