diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-02-24 19:37:03 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-24 19:37:03 +0100 |
| commit | 3941af527df6f27c88258c5d3b78720a07fe60ef (patch) | |
| tree | 4747f74f32faef8a4f20bf7adf797ce57a8324fc /gnu/packages/vim.scm | |
| parent | d85f8e46dbc5a978fe7359c89cbb3167fb9c2029 (diff) | |
| parent | 7daae3c9d09a4d27586824a1d1af99e7af454d26 (diff) | |
| download | guix-3941af527df6f27c88258c5d3b78720a07fe60ef.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/vim.scm')
| -rw-r--r-- | gnu/packages/vim.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 1d4a7a3f94..579b21524e 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,13 +77,19 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0ixwr7kkxc1cj837v1bbgghkd68gbynfn7pc4rb87ah9sm6bgaz3")))) + "1559lg8wgydyfc8c2sb2m7p8mlkarm7539qfxkh1skrw4mxi605k")))) (build-system gnu-build-system) (arguments `(#:test-target "test" #: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") |