diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-06-11 23:52:15 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-11 23:52:15 +0200 |
| commit | a032b4454b3fc67e11e9fc2d8c2345288065fa29 (patch) | |
| tree | c208124b79dbd2224b68c52106aa72ff2ebfa7ab /gnu/packages/vim.scm | |
| parent | b5724230fed2d043206df20d12a45bb962b7ee77 (diff) | |
| parent | 6321ce42ab4d9ab788d858cb19bde4aa7a0e3ecc (diff) | |
| download | guix-a032b4454b3fc67e11e9fc2d8c2345288065fa29.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/vim.scm')
| -rw-r--r-- | gnu/packages/vim.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index e85d3ebd5b..76240d85f1 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -61,7 +61,7 @@ (define-public vim (package (name "vim") - (version "8.0.1428") + (version "8.1.0026") (source (origin (method url-fetch) (uri (string-append "https://github.com/vim/vim/archive/v" @@ -69,7 +69,7 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "08hzx843cxr5b2llc3332wxpgh3gjrs7jgd6s3sdrxnvg0s0y7s8")))) + "14q99dn113czp522j34p71za6g1mkriy04xxwcbm3axnrrpv1y52")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -81,7 +81,8 @@ (substitute* "runtime/tools/mve.awk" (("/usr/bin/nawk") (which "gawk"))) (substitute* '("src/testdir/Makefile" - "src/testdir/test_normal.vim") + "src/testdir/test_normal.vim" + "src/testdir/test_terminal.vim") (("/bin/sh") (which "sh"))) #t)) (add-before 'check 'patch-failing-test @@ -93,7 +94,6 @@ #t))))) (inputs `(("gawk" ,gawk) - ("inetutils" ,inetutils) ("ncurses" ,ncurses) ("perl" ,perl) ("tcsh" ,tcsh))) ; For runtime/tools/vim32 @@ -121,12 +121,14 @@ configuration files.") (delete 'configure) (add-after 'unpack 'chdir (lambda _ - (chdir "src/xxd"))) + (chdir "src/xxd") + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (install-file "xxd" bin) #t)))))) + (inputs `()) (synopsis "Hexdump utility from vim") (description "This package provides the Hexdump utility xxd that comes with the editor vim."))) |