From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Updating Vim Date: Wed, 9 Mar 2016 11:16:16 +0200 Message-ID: <20160309091616.GA20945@debian-netbook> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="O5XBE6gyVG5Rl6Rj" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adaEB-0002vv-It for guix-devel@gnu.org; Wed, 09 Mar 2016 04:16:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adaE8-0001ck-Ap for guix-devel@gnu.org; Wed, 09 Mar 2016 04:16:23 -0500 Received: from flashner.co.il ([178.62.234.194]:46523) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adaE7-0001cc-W5 for guix-devel@gnu.org; Wed, 09 Mar 2016 04:16:20 -0500 Received: from debian-netbook (85.65.229.31.dynamic.barak-online.net [85.65.229.31]) by flashner.co.il (Postfix) with ESMTPSA id A2F9C400A5 for ; Wed, 9 Mar 2016 09:16:18 +0000 (UTC) Content-Disposition: inline List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --O5XBE6gyVG5Rl6Rj Content-Type: multipart/mixed; boundary="YZ5djTAD1cGYuMQK" Content-Disposition: inline --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 ea= sy. 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. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-vim-Update-to-7.4.963.patch" Content-Transfer-Encoding: quoted-printable =46rom d99bead9ea8ea9d72ab128aab404f8513cfc5253 Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner 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 =C2=A9 2013 Cyril Roelandt +;;; Copyright =C2=A9 2016 Efraim Flashner ;;; ;;; 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" --=20 2.7.0 --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0002-gnu-vim-Use-modify-phases.patch" Content-Transfer-Encoding: quoted-printable =46rom 0b2d7df57366d27aa715ba4d824ef0b80b458823 Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner 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) --=20 2.7.0 --YZ5djTAD1cGYuMQK-- --O5XBE6gyVG5Rl6Rj Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJW3+ndAAoJEPTB05F+rO6T7kMP/Rdn0oudJuh/ZdAzvHrN1hwI AWfZYmq1fPI3O/Spm03xCzSL11kjBHFqjnKHIf34p/67Mct4fpuI54oig+e7k3Zo RgDaRyWjNb2gwxFeTQgha51bi5cV4tJo9sr+9g+z8LuOVPzjUyW19eKi/XsZK4Hs QfVGZ5cybGNPehc8T/ii5/c73WqxpZquwJqb124nlrUx08pMJzwpSFyQdxo3Y781 XydUugkI8aqc//iHwsuu8R8aCvzRaWEb8b5it5QOXjlW+SVEvFC0RYYacAH1F0oX Bi7B8uB4mYJqme7NmLCZTVcVmqcKAKPeinciiXnwyLUNc/cEM3Xzf7QpaOEpwrKy DWszr18AothSgsRO8/tPNyasIdBJcSZ0hau7k5D5ncuBAr3svV8KDwA2Iiq0DECT 98KQGAWRiDi/R6HdlUp0NtxtshlD0J6PP68qzon0JuUekZ6XErt3EvCcED4XRlRs aKPWnQ06nWabgicp6kOl2wZp1iOACKo3MV56r6M5vFzMh8NZJh9smNzIvqbadYvs 0NogujFZWQKh4Ef1amxd6eVpsqEhqXHBvZJ6DQwLFsO6ZJDKHg29H+czv8QkTiLL 4hpxshAwpnbGcxYpFuYBD0WfKRfiJHvMKh7lwrd0K8m9Fh2BgdtTC3/Iwr15tez5 udNT09CogskF0s1NDzw/ =BdCG -----END PGP SIGNATURE----- --O5XBE6gyVG5Rl6Rj--