diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-09-30 12:01:32 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-09-30 12:05:27 +0200 |
commit | 79355ae3e84359716f5135cc7083e72246bc8bf9 (patch) | |
tree | 6b61851e2153581578bb78ef0f177b8841ee5db7 /gnu/packages/vim.scm | |
parent | 39d6b9c99f297e14fc4f47f002be3d40556726be (diff) | |
parent | 86d8f6d3efb8300a3354735cbf06be6c01e23243 (diff) | |
download | guix-79355ae3e84359716f5135cc7083e72246bc8bf9.tar guix-79355ae3e84359716f5135cc7083e72246bc8bf9.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/vim.scm')
-rw-r--r-- | gnu/packages/vim.scm | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 44f94ff49e..b1ee527c7a 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> +;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,26 +32,35 @@ (define-public vim (package (name "vim") - (version "7.4") + (version "8.0") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.vim.org/pub/vim/unix/vim-" version ".tar.bz2")) (sha256 (base32 - "1pjaffap91l2rb9pjnlbrpvb3ay5yhhr3g91zabjvw1rqk9adxfh")))) + "1s34rf8089klsbdx5l0iw7vjymir0kzfrx8wb30s31wygnq29axc")))) (build-system gnu-build-system) (arguments `(#:test-target "test" #:parallel-tests? #f #:phases (modify-phases %standard-phases + (add-after 'unpack 'make-bit-reproducable + (lambda _ + (substitute* "src/version.c" + ((" VIM_VERSION_LONG_DATE") " VIM_VERSION_LONG") + ((" __DATE__") "") + ((" __TIME__") "")) + #t)) (add-after 'configure 'patch-config-files (lambda _ (substitute* "runtime/tools/mve.awk" (("/usr/bin/nawk") (which "gawk"))) - (substitute* "src/testdir/Makefile" - (("/bin/sh") (which "sh")))))))) + (substitute* '("src/testdir/Makefile" + "src/testdir/test_normal.vim") + (("/bin/sh") (which "sh"))) + #t))))) (inputs `(("gawk" ,gawk) ("inetutils" ,inetutils) |