From 40cae204b994300452571f2c9e86d7dc6b83f627 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Feb 2020 16:42:53 +0200
Subject: gnu: vim: Update to 8.2.0303.

* gnu/packages/vim.scm (vim): Update to 8.2.0303.
---
 gnu/packages/vim.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 1d4a7a3f94..67f245b26d 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -68,7 +68,7 @@
 (define-public vim
   (package
     (name "vim")
-    (version "8.2.0236")
+    (version "8.2.0303")
     (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -77,7 +77,7 @@
              (file-name (git-file-name name version))
              (sha256
               (base32
-               "0ixwr7kkxc1cj837v1bbgghkd68gbynfn7pc4rb87ah9sm6bgaz3"))))
+               "1559lg8wgydyfc8c2sb2m7p8mlkarm7539qfxkh1skrw4mxi605k"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
-- 
cgit v1.2.3


From b947ba77e60d3d3c5cc6a1c914096e7dab1f7db7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 23 Feb 2020 17:15:12 +0100
Subject: gnu: vim: Fix build on CoW file systems.

* gnu/packages/vim.scm (vim)[arguments]: Add disable-CoW phase.
---
 gnu/packages/vim.scm | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 67f245b26d..579b21524e 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -84,6 +84,12 @@
        #:parallel-tests? #f
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'disable-CoW
+           ;; Disable copy-on-write (CoW) in the build directory.  Tests fail on
+           ;; btrfs (and possibly other CoW file systems) for unclear reasons.
+           ;; This needs to be run early as it only affects newly-created files.
+           (lambda _
+             (invoke "chattr" "-R" "+C" ".")))
          (add-after 'configure 'patch-config-files
            (lambda _
              (substitute* "runtime/tools/mve.awk"
@@ -128,6 +134,7 @@
      `(("libtool" ,libtool)
 
        ;; For tests.
+       ("e2fsprogs" ,e2fsprogs)         ; for chattr in disable-CoW above
        ("tzdata" ,tzdata-for-tests)))
     (home-page "https://www.vim.org/")
     (synopsis "Text editor based on vi")
-- 
cgit v1.2.3