From db3cc007e38daf919bdc6a21e048b2d0c32f15e5 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 12 Sep 2016 20:55:21 +0300
Subject: gnu: vim: Update to 8.0.

* gnu/packages/vim.scm (vim): Update to 8.0.
[arguments]: Update files which need /bin/sh patched.
---
 gnu/packages/vim.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/vim.scm')

diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 44f94ff49e..68c95d09ce 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -31,14 +31,14 @@ (define-module (gnu packages vim)
 (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"
@@ -49,8 +49,10 @@ (define-public vim
            (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)
-- 
cgit v1.2.3


From f51940b0f57fd5657f5ae0f6fa6f8b8b55f1dec7 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 12 Sep 2016 21:52:17 +0300
Subject: gnu: vim: Make builds bit-reproducable.

* gnu/packages/vim.scm (vim)[arguments]: Remove the compiled date.
---
 gnu/packages/vim.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'gnu/packages/vim.scm')

diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 68c95d09ce..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.
 ;;;
@@ -45,6 +46,13 @@ (define-public vim
        #: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"
-- 
cgit v1.2.3