Updating Vim

Updating Vim

[Efraim Flashner]

[-- Attachment #1.1: Type: text/plain, Size: 797 bytes --]

Our current vim package is 2.5 years old, and the current patch set on top of
it to bring it up to today is ~1500 patches. Interestingly, every. single.
commit. is tagged in git, so updating to a more recent release is rather easy.
This has been one of the things that has kept me using Debian's vim over
Guix's vim.In this patch I've only updated it to 7.4.963 because that's the
version Debian is currently shipping (in sid), which is only 3 months old,
and some of the later versions had issues with the test. This'll bump us
forward a lot, which is a good starting point.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #1.2: 0001-gnu-vim-Update-to-7.4.963.patch --]
[-- Type: text/plain, Size: 2026 bytes --]

From d99bead9ea8ea9d72ab128aab404f8513cfc5253 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 9 Mar 2016 11:07:39 +0200
Subject: [PATCH 1/2] gnu: vim: Update to 7.4.963.

* gnu/packages/vim.scm (vim): Update to 7.4.963.
[source]: Use git-tags for downloading.
---
 gnu/packages/vim.scm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 2418963..4834b69 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.
 ;;;
@@ -19,7 +20,7 @@
 (define-module (gnu packages vim)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
-  #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
   #:use-module (gnu packages gawk)
@@ -31,14 +32,17 @@
 (define-public vim
   (package
     (name "vim")
-    (version "7.4")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "ftp://ftp.vim.org/pub/vim/unix/vim-"
-                                 version ".tar.bz2"))
-             (sha256
-              (base32
-               "1pjaffap91l2rb9pjnlbrpvb3ay5yhhr3g91zabjvw1rqk9adxfh"))))
+    (version "7.4.963")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/vim/vim.git")
+               (commit (string-append "v" version))))
+        (file-name (string-append "vim-" version "-checkout"))
+        (sha256
+         (base32
+          "1k4n5ybw5wp2iwfp8ax7x3cq5x137rq1hc10h51c9a13qmby741b"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
-- 
2.7.0


[-- Attachment #1.3: 0002-gnu-vim-Use-modify-phases.patch --]
[-- Type: text/plain, Size: 1353 bytes --]

From 0b2d7df57366d27aa715ba4d824ef0b80b458823 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 9 Mar 2016 11:09:06 +0200
Subject: [PATCH 2/2] gnu: vim: Use 'modify-phases'.

* gnu/packages/vim.scm (vim)[arguments]: Use 'modify-phases' syntax.
---
 gnu/packages/vim.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 4834b69..959bccf 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -48,14 +48,13 @@
      `(#:test-target "test"
        #:parallel-tests? #f
        #:phases
-        (alist-cons-after
-         'configure 'patch-config-files
-         (lambda _
-           (substitute* "runtime/tools/mve.awk"
-             (("/usr/bin/nawk") (which "gawk")))
-           (substitute* "src/testdir/Makefile"
-             (("/bin/sh") (which "sh"))))
-          %standard-phases)))
+       (modify-phases %standard-phases
+         (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"))))))))
     (inputs
      `(("gawk" ,gawk)
        ("inetutils" ,inetutils)
-- 
2.7.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: Updating Vim

[Ricardo Wurmus]

Efraim Flashner <efraim@flashner.co.il> writes:

> Our current vim package is 2.5 years old, and the current patch set on top of
> it to bring it up to today is ~1500 patches. Interestingly, every. single.
> commit. is tagged in git, so updating to a more recent release is rather easy.
> This has been one of the things that has kept me using Debian's vim over
> Guix's vim.In this patch I've only updated it to 7.4.963 because that's the
> version Debian is currently shipping (in sid), which is only 3 months old,
> and some of the later versions had issues with the test. This'll bump us
> forward a lot, which is a good starting point.

Interesting.

Both patches look good to me.  If I was in nit-picking mode I’d say that

    “[source]: Use git-tags for downloading.”

in the commit message is a little confusing because “git-tags” sounds
like a procedure name.  I’d just write “[source]: Fetch from git.”.

~~ Ricardo

Re: Updating Vim

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 751 bytes --]

On Wed, 9 Mar 2016 10:39:08 +0100
Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> wrote:

> Efraim Flashner <efraim@flashner.co.il> writes:
> 
>  [...]  
> 
> Interesting.
> 
> Both patches look good to me.  If I was in nit-picking mode I’d say that
> 
>     “[source]: Use git-tags for downloading.”
> 
> in the commit message is a little confusing because “git-tags” sounds
> like a procedure name.  I’d just write “[source]: Fetch from git.”.
> 
> ~~ Ricardo

"Fetch from git." does sound much better.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: Updating Vim

[Andreas Enge]

On Wed, Mar 09, 2016 at 11:16:16AM +0200, Efraim Flashner wrote:
> Our current vim package is 2.5 years old, and the current patch set on top of
> it to bring it up to today is ~1500 patches. Interestingly, every. single.
> commit. is tagged in git, so updating to a more recent release is rather easy.

Well, it is not quite a release, I would say, if they simply tag every git
commit and do not even make sure that the tests succeed each time. Normally,
our policy in guix is to follow "official" upstream releases.

Is there a compelling reason to update nevertheless?

Andreas

Re: Updating Vim

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]

On Wed, 9 Mar 2016 10:45:44 +0100
Andreas Enge <andreas@enge.fr> wrote:

> On Wed, Mar 09, 2016 at 11:16:16AM +0200, Efraim Flashner wrote:
>  [...]  
> 
> Well, it is not quite a release, I would say, if they simply tag every git
> commit and do not even make sure that the tests succeed each time. Normally,
> our policy in guix is to follow "official" upstream releases.
> 
> Is there a compelling reason to update nevertheless?
> 
> Andreas
> 

There was something that was not interacting well with my .vimrc, but I just
checked with 7.4 and 7.4.963 and there wasn't actually a change. Either I
stopped using some plugin that wanted a newer version or I misread it before.
"Because its 2 years old" isn't a great reason. There is a list of patches
with a 1-liner[1] for what it fixes, so I suppose for that it would be good
to have those issues taken care of, and also to have our copy of vim more
up-to-date with other distros.

[1] ftp://ftp.vim.org/pub/vim/patches/7.4/README

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]