From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJVOT-0000gQ-HZ for guix-patches@gnu.org; Mon, 27 Nov 2017 21:13:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJVOQ-0003av-C7 for guix-patches@gnu.org; Mon, 27 Nov 2017 21:13:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:52813) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eJVOQ-0003ap-8I for guix-patches@gnu.org; Mon, 27 Nov 2017 21:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eJVOP-0001aN-VW for guix-patches@gnu.org; Mon, 27 Nov 2017 21:13:02 -0500 Subject: [bug#29479] [PATCH] gnu: zsh: Update to 5.4.2. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJVNL-0000YN-Um for guix-patches@gnu.org; Mon, 27 Nov 2017 21:11:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJVNI-0003AZ-PH for guix-patches@gnu.org; Mon, 27 Nov 2017 21:11:55 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:39785) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eJVNI-0003AH-HQ for guix-patches@gnu.org; Mon, 27 Nov 2017 21:11:52 -0500 Received: from jasmine.lan (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id 712197E21B for ; Mon, 27 Nov 2017 21:11:51 -0500 (EST) From: Leo Famulari Date: Mon, 27 Nov 2017 21:11:47 -0500 Message-Id: <728fadab5351369d5b306452e4088b409d5832fb.1511835107.git.leo@famulari.name> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29479@debbugs.gnu.org * gnu/packages/shells.scm (zsh): Update to 5.4.2. [arugments]: Add a 'patch-test' build phase. --- gnu/packages/shells.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 7ea521a08..16b149dd5 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 initialization 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) -- 2.15.0