summaryrefslogtreecommitdiff
path: root/gnu/packages/vim.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2017-08-20 23:22:32 +0300
committerEfraim Flashner <efraim@flashner.co.il>2017-08-20 23:23:17 +0300
commit1dbd34329b50118264ed21ddeace55152096842d (patch)
tree498bda9a4c92dbdca7e4fdfedc965dc90e4634a1 /gnu/packages/vim.scm
parentbda6c350939dac5d073e999a3e940abd5bcc4b97 (diff)
gnu: vifm: Update to 0.9.
* gnu/packages/vim.scm (vifm): Update to 0.9. [source]: Add alternate uri. [arguments]: Remove build timestamp. Add phase to install vim plugins into vim plugin directory. Patch more shebangs.
Diffstat (limited to 'gnu/packages/vim.scm')
-rw-r--r--gnu/packages/vim.scm40
1 files changed, 31 insertions, 9 deletions
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 7db81ee57d..818d2d207f 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 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 ng0 <ng0@no-reply.pragmatique.xyz>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
@@ -648,24 +648,46 @@ refactor Vim in order to:
(define-public vifm
(package
(name "vifm")
- (version "0.8.2")
+ (version "0.9")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://sourceforge/vifm/vifm/vifm-"
- version ".tar.bz2"))
+ (uri (list
+ (string-append "https://github.com/vifm/vifm/releases/download/v"
+ version "/vifm-" version ".tar.bz2")
+ (string-append "https://sourceforge.net/projects/vifm/files/vifm/"
+ "vifm-" version ".tar.bz2")))
(sha256
(base32
- "07r15kq7kjl3a41sd11ncpsii866xxps4f90zh3lv8jqcrv6silb"))))
+ "1zd72vcgir3g9rhs2iyca13qf5fc0b1f22y20f5gy92c3sfwj45b"))))
(build-system gnu-build-system)
(arguments
- '(#:phases
+ '(#:configure-flags '("--disable-build-timestamp")
+ #:phases
(modify-phases %standard-phases
(add-after 'patch-source-shebangs 'patch-test-shebangs
(lambda _
- (substitute* (find-files "tests" "\\.c$")
- (("/bin/sh") (which "sh")))
- #t)))))
+ (substitute* (cons* "src/background.c"
+ "src/cfg/config.c"
+ (find-files "tests" "\\.c$"))
+ (("/bin/sh") (which "sh"))
+ (("/bin/bash") (which "bash")))
+ ;; This test segfaults
+ (substitute* "tests/Makefile"
+ (("misc") ""))
+ #t))
+ (add-after 'install 'install-vim-plugin-files
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (vifm (string-append out "/share/vifm"))
+ (vimfiles (string-append out "/share/vim/vimfiles")))
+ (copy-recursively (string-append vifm "/colors")
+ (string-append vimfiles "/colors"))
+ (copy-recursively (string-append vifm "/vim")
+ vimfiles)
+ (delete-file-recursively (string-append vifm "/colors"))
+ (delete-file-recursively (string-append vifm "/vim")))
+ #t)))))
(native-inputs
`(("groff" ,groff) ; for the documentation
("perl" ,perl)))