aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/shells.scm
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2017-11-27 21:10:31 -0500
committerLeo Famulari <leo@famulari.name>2017-11-28 13:52:36 -0500
commit4440e40c6a950a3ccd5696c0227705b4688a56a1 (patch)
treebe0fc97aa2d8ed7397edd522ababb9e34091d10b /gnu/packages/shells.scm
parentfbf5ca3c5e23a4f48e6d91d7229edca283fa86b9 (diff)
downloadguix-4440e40c6a950a3ccd5696c0227705b4688a56a1.tar
guix-4440e40c6a950a3ccd5696c0227705b4688a56a1.tar.gz
gnu: zsh: Update to 5.4.2.
* gnu/packages/shells.scm (zsh): Update to 5.4.2. [arguments]: Add a 'patch-test' build phase.
Diffstat (limited to 'gnu/packages/shells.scm')
-rw-r--r--gnu/packages/shells.scm16
1 files changed, 13 insertions, 3 deletions
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 7ea521a083..62934646cc 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -317,7 +317,7 @@ history mechanism, job control and a C-like syntax.")
(define-public zsh
(package
(name "zsh")
- (version "5.2")
+ (version "5.4.2")
(source (origin
(method url-fetch)
(uri (list (string-append
@@ -328,7 +328,7 @@ history mechanism, job control and a C-like syntax.")
".tar.gz")))
(sha256
(base32
- "0dsr450v8nydvpk8ry276fvbznlrjgddgp7zvhcw4cv69i9lr4ps"))))
+ "1jdcfinzmki2w963msvsanv29vqqfmdfm4rncwpw0r3zqnrcsywm"))))
(build-system gnu-build-system)
(arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre")
#:phases
@@ -351,7 +351,17 @@ history mechanism, job control and a C-like syntax.")
"Test/B02typeset.ztst"
"Completion/Unix/Command/_init_d"
"Util/preconfig")
- (("/bin/sh") (which "sh")))))))))
+ (("/bin/sh") (which "sh"))))))
+ (add-before 'check 'patch-test
+ (lambda _
+ ;; In Zsh, `command -p` searches a predefined set of
+ ;; paths that don't exist in the build environment. See
+ ;; the assignment of 'path' in Src/init.c'
+ (substitute* "Test/A01grammar.ztst"
+ (("command -pv") "command -v")
+ (("command -p") "command ")
+ (("'command' -p") "'command' "))
+ #t)))))
(native-inputs `(("autoconf" ,autoconf)))
(inputs `(("ncurses" ,ncurses)
("pcre" ,pcre)