diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-09-09 17:40:35 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-09-09 17:40:35 +0200 |
| commit | 0aeb13485055975d71ec8283040f007c79599bba (patch) | |
| tree | a06139136c809b00d166d6d66bdf757f20566704 /gnu/packages/shells.scm | |
| parent | b03f270e3d5ab5315b50ef3ebac35735cc28d4a2 (diff) | |
| parent | 0084744b3af0a6f8e125120143f57567902339a8 (diff) | |
| download | guix-0aeb13485055975d71ec8283040f007c79599bba.tar guix-0aeb13485055975d71ec8283040f007c79599bba.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/shells.scm')
| -rw-r--r-- | gnu/packages/shells.scm | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 6dbe1c4db7..900c8ec686 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -292,7 +292,7 @@ history mechanism, job control and a C-like syntax.") (define-public zsh (package (name "zsh") - (version "5.5.1") + (version "5.6") (source (origin (method url-fetch) (uri (list (string-append @@ -303,7 +303,7 @@ history mechanism, job control and a C-like syntax.") ".tar.xz"))) (sha256 (base32 - "105aqkdfsdxc4531anrj2zis2ywz6icagjam9lsc235yzh48ihz1")))) + "1mp6h2452z2029n12mxipjv4b0cc8i8sb72g8p8jklg8275iysvl")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") #:phases @@ -336,6 +336,19 @@ history mechanism, job control and a C-like syntax.") (("command -pv") "command -v") (("command -p") "command ") (("'command' -p") "'command' ")) + ;; This file is ISO-8859-1 encoded. + (with-fluids ((%default-port-encoding #f)) + (substitute* "Test/A05execution.ztst" + ;; Help it find `sh` + (("PATH=/bin:\\$\\{ZTST_testdir\\}/command.tmp/ tstcmd-slashless") + (string-append "PATH=/bin:" + (assoc-ref %build-inputs "bash") "/bin:" + "${ZTST_testdir}/command.tmp/ tstcmd-slashless")) + ;; Help it find `echo` + (("PATH=/bin:\\$\\{ZTST_testdir\\}/command.tmp tstcmd-arg") + (string-append "PATH=/bin:" + (assoc-ref %build-inputs "coreutils") "/bin:" + "PATH=/bin:${ZTST_testdir}/command.tmp tstcmd-arg")))) #t))))) (native-inputs `(("autoconf" ,autoconf))) (inputs `(("ncurses" ,ncurses) |