From 40cae204b994300452571f2c9e86d7dc6b83f627 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Feb 2020 16:42:53 +0200 Subject: gnu: vim: Update to 8.2.0303. * gnu/packages/vim.scm (vim): Update to 8.2.0303. --- 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 1d4a7a3f94..67f245b26d 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -68,7 +68,7 @@ (define-public vim (package (name "vim") - (version "8.2.0236") + (version "8.2.0303") (source (origin (method git-fetch) (uri (git-reference @@ -77,7 +77,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0ixwr7kkxc1cj837v1bbgghkd68gbynfn7pc4rb87ah9sm6bgaz3")))) + "1559lg8wgydyfc8c2sb2m7p8mlkarm7539qfxkh1skrw4mxi605k")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From b947ba77e60d3d3c5cc6a1c914096e7dab1f7db7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Feb 2020 17:15:12 +0100 Subject: gnu: vim: Fix build on CoW file systems. * gnu/packages/vim.scm (vim)[arguments]: Add disable-CoW phase. --- gnu/packages/vim.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 67f245b26d..579b21524e 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -84,6 +84,12 @@ #:parallel-tests? #f #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-CoW + ;; Disable copy-on-write (CoW) in the build directory. Tests fail on + ;; btrfs (and possibly other CoW file systems) for unclear reasons. + ;; This needs to be run early as it only affects newly-created files. + (lambda _ + (invoke "chattr" "-R" "+C" "."))) (add-after 'configure 'patch-config-files (lambda _ (substitute* "runtime/tools/mve.awk" @@ -128,6 +134,7 @@ `(("libtool" ,libtool) ;; For tests. + ("e2fsprogs" ,e2fsprogs) ; for chattr in disable-CoW above ("tzdata" ,tzdata-for-tests))) (home-page "https://www.vim.org/") (synopsis "Text editor based on vi") -- cgit v1.2.3 From 679d41b4406d30ec5805ee8015d2ffa446a4e334 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Feb 2020 01:59:37 +0100 Subject: Revert "gnu: vim: Fix build on CoW file systems." This reverts commit b947ba77e60d3d3c5cc6a1c914096e7dab1f7db7. --- gnu/packages/vim.scm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 579b21524e..67f245b26d 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -84,12 +84,6 @@ #:parallel-tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-CoW - ;; Disable copy-on-write (CoW) in the build directory. Tests fail on - ;; btrfs (and possibly other CoW file systems) for unclear reasons. - ;; This needs to be run early as it only affects newly-created files. - (lambda _ - (invoke "chattr" "-R" "+C" "."))) (add-after 'configure 'patch-config-files (lambda _ (substitute* "runtime/tools/mve.awk" @@ -134,7 +128,6 @@ `(("libtool" ,libtool) ;; For tests. - ("e2fsprogs" ,e2fsprogs) ; for chattr in disable-CoW above ("tzdata" ,tzdata-for-tests))) (home-page "https://www.vim.org/") (synopsis "Text editor based on vi") -- cgit v1.2.3 From cae3b3774ea9905bbf6a7299c3cd964cfa48a705 Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Tue, 25 Feb 2020 14:16:07 -0500 Subject: gnu: vim-full: Describe differences from vim. * gnu/packages/vim.scm (vim-full)[description]: New field. Explain what vim-full provides over vim. Signed-off-by: Marius Bakke --- gnu/packages/vim.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 67f245b26d..a94a677b25 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2019 HiPhish ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019, 2020 Jakub Kądziołka +;;; Copyright © 2020 Jack Hill ;;; ;;; This file is part of GNU Guix. ;;; @@ -131,6 +132,8 @@ ("tzdata" ,tzdata-for-tests))) (home-page "https://www.vim.org/") (synopsis "Text editor based on vi") + ;; The description shares language with the vim-full package. When making + ;; changes, check if the other description also needs to be updated. (description "Vim is a highly configurable text editor built to enable efficient text editing. It is an improved version of the vi editor distributed with most UNIX @@ -254,7 +257,21 @@ with the editor vim."))) ("python-3" ,python) ("ruby" ,ruby) ("tcl" ,tcl) - ,@(package-inputs vim))))) + ,@(package-inputs vim))) + ;; The description shares language with the vim package. When making + ;; changes, check if the other description also needs to be updated. + (description "Vim is a highly configurable text editor built to enable efficient text +editing. It is an improved version of the vi editor distributed with most UNIX +systems. + +Vim is often called a \"programmer's editor,\" and so useful for programming +that many consider it an entire IDE. It's not just for programmers, though. +Vim is perfect for all kinds of text editing, from composing email to editing +configuration files. + +This package provides a version of Vim with many optional features enabled. +It includes a graphical interface, @command{gvim}, and support for plugins +written in the Python 3, Perl, Ruby, Tcl, and Lua programming languages."))) (define-public vim-neocomplete (package -- cgit v1.2.3 From b5aa17adea398a5d93ecdeb3b1478bfc610d59bf Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 29 Feb 2020 17:26:38 +0100 Subject: gnu: vim: Update to 8.2.0332. * gnu/packages/vim.scm (vim): Update to 8.2.0332. Signed-off-by: Leo Famulari --- 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 a94a677b25..d9ee202fec 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -69,7 +69,7 @@ (define-public vim (package (name "vim") - (version "8.2.0303") + (version "8.2.0332") (source (origin (method git-fetch) (uri (git-reference @@ -78,7 +78,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1559lg8wgydyfc8c2sb2m7p8mlkarm7539qfxkh1skrw4mxi605k")))) + "0icgykml4wxq554h7r9rcxpxipg0yri651b9fijvv364ycywsq8c")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From c1febbbf94ee794d7a97dbde12102634f2b13529 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Mar 2020 10:39:51 +0200 Subject: gnu: vim: Update to 8.2.0343. * gnu/packages/vim.scm (vim): Update to 8.2.0343. --- 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 d9ee202fec..d130072272 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -69,7 +69,7 @@ (define-public vim (package (name "vim") - (version "8.2.0332") + (version "8.2.0343") (source (origin (method git-fetch) (uri (git-reference @@ -78,7 +78,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0icgykml4wxq554h7r9rcxpxipg0yri651b9fijvv364ycywsq8c")))) + "063i52h8v7f87zamrw2ph057f0x2nzwf1s0izrm2psy41cyf4wa3")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 72194753d9fcaed2ccaaf78d3982cb0eac6ef343 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 10:56:47 +0200 Subject: gnu: vim-neocomplete: Use copy-build-system. * gnu/packages/vim.scm (vim-neocomplete)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index d130072272..37af7c6193 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -32,6 +32,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -287,24 +288,12 @@ written in the Python 3, Perl, Ruby, Tcl, and Lua programming languages."))) (sha256 (base32 "1h6sci5mhdfg6sjsjpi8l5li02hg858zcayiwl60y9j2gqnd18lv")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (autoload (string-append vimfiles "/autoload")) - (doc (string-append vimfiles "/doc")) - (plugin (string-append vimfiles "/plugin"))) - (copy-recursively "autoload" autoload) - (copy-recursively "doc" doc) - (copy-recursively "plugin" plugin) - #t)))))) + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/")))) (synopsis "Next generation completion framework for Vim") (description "@code{neocomplete}, an abbreviation of 'neo-completion with cache', -- cgit v1.2.3 From 90d64d9ca9b6940dc8ab0ea811d091e27f57552e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:00:13 +0200 Subject: gnu: vim-neosnippet-snippets: Use copy-build-system. * gnu/packages/vim.scm (vim-neosnippet-snippets)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 37af7c6193..54c9c5eaca 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -321,20 +321,10 @@ features than Vim's built-in completion.") (sha256 (base32 "151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vimfiles (string-append out "/share/vim/vimfiles"))) - (copy-recursively "neosnippets" - (string-append vimfiles "/neosnippets")) - #t)))))) + '(#:install-plan + '(("neosnippets" "share/vim/vimfiles/")))) (synopsis "Snippets for neosnippet") (description "@code{neosnippet-snippets} provides standard snippets for the Vim plugin -- cgit v1.2.3 From f19e539c3e7f9df06f413eeb9439925dedf03715 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:10:11 +0200 Subject: gnu: vim-neosnippet: Use copy-build-system. * gnu/packages/vim.scm (vim-neosnippet)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 54c9c5eaca..7588d9cbbd 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -350,34 +350,17 @@ you can fill in on the fly.") (sha256 (base32 "0k80syscmpnj38ks1fq02ds59g0r4jlg9ll7z4qc048mgi35alw5")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (autoload (string-append vimfiles "/autoload")) - (doc (string-append vimfiles "/doc")) - (ftdetect (string-append vimfiles "/ftdetect")) - (ftplugin (string-append vimfiles "/ftplugin")) - (indent (string-append vimfiles "/indent")) - (plugin (string-append vimfiles "/plugin")) - (rplugin (string-append vimfiles "/rplugin")) - (syntax (string-append vimfiles "/syntax"))) - (copy-recursively "autoload" autoload) - (copy-recursively "doc" doc) - (copy-recursively "ftdetect" ftdetect) - (copy-recursively "ftplugin" ftplugin) - (copy-recursively "indent" indent) - (copy-recursively "plugin" plugin) - (copy-recursively "rplugin" rplugin) - (copy-recursively "syntax" syntax) - #t)))))) + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("ftdetect" "share/vim/vimfiles/") + ("ftplugin" "share/vim/vimfiles/") + ("indent" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/") + ("rplugin" "share/vim/vimfiles/") + ("syntax" "share/vim/vimfiles/")))) (synopsis "Snippet support for Vim") (description "@code{neosnippet}, is a plugin for Vim which adds snippet support to Vim. -- cgit v1.2.3 From 0db06e7da943189550c77209f7ebc376df9b0daa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:36:24 +0200 Subject: gnu: vim-scheme: Use copy-build-system. * gnu/packages/vim.scm (vim-scheme)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 7588d9cbbd..f6c6d036f5 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -389,24 +389,12 @@ trouble using them, because you do not have to remember each snippet name.") (sha256 (base32 "1ynjr1109dxgj0lz261gmzz3wf5ap1m6j6hnvl3lcyv66a4y8pjv")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (after (string-append vimfiles "/after")) - (syntax (string-append vimfiles "/syntax")) - (ftplugin (string-append vimfiles "/ftplugin"))) - (copy-recursively "after" after) - (copy-recursively "ftplugin" ftplugin) - (copy-recursively "syntax" syntax) - #t)))))) + '(#:install-plan + '(("after" "share/vim/vimfiles/") + ("ftplugin" "share/vim/vimfiles/") + ("syntax" "share/vim/vimfiles/")))) (synopsis "Scheme syntax for Vim") (description "@code{vim-scheme} provides Scheme support for Vim (R7RS and CHICKEN).") -- cgit v1.2.3 From 84ec7b70090c7bf886cd9d023396d6d2e6e663fb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:39:05 +0200 Subject: gnu: vim-luna: Use copy-build-system. * gnu/packages/vim.scm (vim-luna)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index f6c6d036f5..ca39effd14 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -417,20 +417,10 @@ trouble using them, because you do not have to remember each snippet name.") (sha256 (base32 "0ka3qbhsh8lix1vyj4678j7dnchkd8khhirrnn3aylxxf8fpqyg8")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (colors (string-append vimfiles "/colors"))) - (copy-recursively "colors" colors) - #t)))))) + '(#:install-plan + '(("colors" "share/vim/vimfiles/")))) (synopsis "Dark color theme for Vim") (description "@code{vim-luna} is a dark color theme for Vim.") -- cgit v1.2.3 From 0b350f73fe649575cfbc2215cc7bab8859184bc9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:41:11 +0200 Subject: gnu: vim-context-filetype: Use copy-build-system. * gnu/packages/vim.scm (vim-context-filetype)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index ca39effd14..aa082d7652 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -444,22 +444,11 @@ trouble using them, because you do not have to remember each snippet name.") (sha256 (base32 "0alvrfhmd91zkd9h83s8wvgyq4iakcf6rybsyjd369qbgpcqky89")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (doc (string-append vimfiles "/doc")) - (autoload (string-append vimfiles "/autoload"))) - (copy-recursively "doc" doc) - (copy-recursively "autoload" autoload) - #t)))))) + '(#:install-plan + '(("doc" "share/vim/vimfiles/") + ("autoload" "share/vim/vimfiles/")))) (synopsis "Context filetype library for Vim") (description "@code{vim-context-filetype} is context filetype library for Vim script.") -- cgit v1.2.3 From b274d2a6cb6fddedbc75e09fd55b76cec371d4ff Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:43:38 +0200 Subject: gnu: vim-fugitive: Use copy-build-system. * gnu/packages/vim.scm (vim-fugitive)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index aa082d7652..4920834898 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -469,28 +469,14 @@ trouble using them, because you do not have to remember each snippet name.") (sha256 (base32 "1jbn5jxadccmcz01j94d0i1bp74cixr0fpxxf1h0aqdf1ljk3d7n")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - '(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (autoload (string-append vimfiles "/autoload")) - (doc (string-append vimfiles "/doc")) - (ftdetect (string-append vimfiles "/ftdetect")) - (plugin (string-append vimfiles "/plugin")) - (syntax (string-append vimfiles "/syntax"))) - (copy-recursively "autoload" autoload) - (copy-recursively "doc" doc) - (copy-recursively "ftdetect" ftdetect) - (copy-recursively "plugin" plugin) - (copy-recursively "syntax" syntax) - #t)))))) + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("ftdetect" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/") + ("syntax" "share/vim/vimfiles/")))) (home-page "https://github.com/tpope/vim-fugitive") (synopsis "Vim plugin to work with Git") (description "Vim-fugitive is a wrapper for Vim that complements the -- cgit v1.2.3 From 8423c6f3b2606d0f9f0d190dc39b50c1ec197844 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:48:07 +0200 Subject: gnu: vim-airline: Use copy-build-system. * gnu/packages/vim.scm (vim-airline)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 4920834898..116bc68dfd 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -498,26 +498,13 @@ commit or run any Git arbitrary command.") (sha256 (base32 "1aksmr73648pvyc75pfdz28k2d4ky52rn7xiwcv7lz87q3vqld7k")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (autoload (string-append vimfiles "/autoload")) - (doc (string-append vimfiles "/doc")) - (t (string-append vimfiles "/t")) - (plugin (string-append vimfiles "/plugin"))) - (copy-recursively "autoload" autoload) - (copy-recursively "doc" doc) - (copy-recursively "plugin" plugin) - (copy-recursively "t" t) - #t)))))) + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/") + ("t" "share/vim/vimfiles/")))) (synopsis "Statusline for Vim") (description "@code{vim-airline} is an extensible statusline for Vim. -- cgit v1.2.3 From e114aa2060a8b43ceee2f38b34a49f888c5b47bd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:50:33 +0200 Subject: gnu: vim-airline-themes: Use copy-build-system. * gnu/packages/vim.scm (vim-airline-themes)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 116bc68dfd..e199be4e52 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -530,24 +530,12 @@ and powerline symbols, etc.") (sha256 (base32 "1sb7nb7j7bz0pv1c9bgdy0smhr0jk2b1vbdv9yzghg5lrknpsbr6")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (doc (string-append vimfiles "/doc")) - (plugin (string-append vimfiles "/plugin")) - (autoload (string-append vimfiles "/autoload"))) - (copy-recursively "doc" doc) - (copy-recursively "autoload" autoload) - (copy-recursively "plugin" plugin) - #t)))))) + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/")))) (synopsis "Collection of themes for Vim-airline") (description "@code{vim-airline-themes} is a collection of themes for @code{vim-airline}.") -- cgit v1.2.3 From 8e38ed1f044a5b42676a35543e452995ac84bc22 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 11:52:59 +0200 Subject: gnu: vim-syntastic: Use copy-build-system. * gnu/packages/vim.scm (vim-syntastic)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. (neovim-syntastic): Same. --- gnu/packages/vim.scm | 48 +++++++++++------------------------------------- 1 file changed, 11 insertions(+), 37 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index e199be4e52..f78d1d0a16 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -555,26 +555,13 @@ and powerline symbols, etc.") (file-name (git-file-name name version)) (sha256 (base32 "0j91f72jaz1s6aw1hpjiz30vk2ds2aqd9gisk91grsldy6nz6hhz")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (doc (string-append vimfiles "/doc")) - (plugin (string-append vimfiles "/plugin")) - (autoload (string-append vimfiles "/autoload")) - (syntax-checkers (string-append vimfiles "/syntax_checkers"))) - (copy-recursively "doc" doc) - (copy-recursively "autoload" autoload) - (copy-recursively "plugin" plugin) - (copy-recursively "syntax_checkers" syntax-checkers) - #t)))))) + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/") + ("syntax_checkers" "share/vim/vimfiles/")))) (synopsis "Syntax checking plugin for Vim") (description "Vim-syntastic is a syntax checking plugin for Vim. It runs files through @@ -642,24 +629,11 @@ editors.") (inherit vim-syntastic) (name "neovim-syntastic") (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vimfiles (string-append out "/share/nvim/site")) - (doc (string-append vimfiles "/doc")) - (plugin (string-append vimfiles "/plugin")) - (autoload (string-append vimfiles "/autoload")) - (syntax-checkers (string-append vimfiles "/syntax_checkers"))) - (copy-recursively "doc" doc) - (copy-recursively "autoload" autoload) - (copy-recursively "plugin" plugin) - (copy-recursively "syntax_checkers" syntax-checkers) - #t)))))) + '(#:install-plan + '(("autoload" "share/nvim/site/") + ("doc" "share/nvim/site/") + ("plugin" "share/nvim/site/") + ("syntax_checkers" "share/nvim/site/")))) (synopsis "Syntax checking plugin for Neovim") (description "Vim-syntastic is a syntax checking plugin for Neovim. It runs files through -- cgit v1.2.3 From 94d53fbb07074132c0052e998bb287a7f464b9be Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 12:00:09 +0200 Subject: gnu: editorconfig-vim: Use copy-build-system. * gnu/packages/vim.scm (editorconfig-vim)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index f78d1d0a16..bed9783281 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -589,30 +589,20 @@ are detected, the user is notified.") (snippet '(begin (delete-file-recursively "plugin/editorconfig-core-py") #t)))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - '(#:tests? #f ; tests require ruby and plugin-test repository - #:phases + '(#:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'build) (add-after 'unpack 'patch-editorconfig-path (lambda* (#:key inputs #:allow-other-keys) (let ((editorconfig (assoc-ref inputs "editorconfig-core"))) (substitute* "plugin/editorconfig.vim" (("/opt") editorconfig)) - #t))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vimfiles (string-append out "/share/vim/vimfiles")) - (doc (string-append vimfiles "/doc")) - (plugin (string-append vimfiles "/plugin")) - (autoload (string-append vimfiles "/autoload"))) - (copy-recursively "doc" doc) - (copy-recursively "autoload" autoload) - (copy-recursively "plugin" plugin) - #t)))))) + #t)))) + #:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/")))) (inputs `(("editorconfig-core" ,editorconfig-core-c))) (home-page "https://editorconfig.org/") -- cgit v1.2.3 From 12fe38a1d651c9ea48c0de27ef103c676f699396 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 12:04:52 +0200 Subject: gnu: vim-guix-vim: Use copy-build-system. * gnu/packages/vim.scm (vim-guix-vim)[build-system]: Switch to copy-build-system. [arguments]: Adjust accordingly. --- gnu/packages/vim.scm | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index bed9783281..b468347380 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -834,22 +834,15 @@ through its msgpack-rpc API.") (sha256 (base32 "1f8h8m96fqh3f9hy87spgh9kdqzyxl11n9s3rywvyq5xhn489bnk")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - '(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vimfiles (string-append out "/share/vim/vimfiles"))) - (for-each - (lambda (dir) - (copy-recursively dir (string-append vimfiles "/" dir))) - '("compiler" "doc" "indent" "ftdetect" "ftplugin" "syntax")) - #t)))))) + '(#:install-plan + '(("compiler" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("indent" "share/vim/vimfiles/") + ("ftdetect" "share/vim/vimfiles/") + ("ftplugin" "share/vim/vimfiles/") + ("syntax" "share/vim/vimfiles/")))) (home-page "https://gitlab.com/Efraim/guix.vim") (synopsis "Guix integration in Vim") (description "This package provides support for GNU Guix in Vim.") -- cgit v1.2.3