From patchwork Thu Mar 30 21:48:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 48829 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BD53417278; Thu, 30 Mar 2023 22:49:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1A1DE171ED for ; Thu, 30 Mar 2023 22:49:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pi08p-00085r-BN; Thu, 30 Mar 2023 17:49:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pi08m-00084r-Vw for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pi08m-0003J0-Of for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pi08m-0000le-KF for guix-patches@gnu.org; Thu, 30 Mar 2023 17:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62553] [PATCH core-updates 6/6] gnu: zsh: Patch failing test that uses egrep. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 21:49:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 62553@debbugs.gnu.org Received: via spool by 62553-submit@debbugs.gnu.org id=B62553.16802129182881 (code B ref 62553); Thu, 30 Mar 2023 21:49:04 +0000 Received: (at 62553) by debbugs.gnu.org; 30 Mar 2023 21:48:38 +0000 Received: from localhost ([127.0.0.1]:59651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08M-0000kK-CG for submit@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:38 -0400 Received: from jpoiret.xyz ([206.189.101.64]:32990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pi08D-0000iz-Ev for 62553@debbugs.gnu.org; Thu, 30 Mar 2023 17:48:30 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 0BABB18530D; Thu, 30 Mar 2023 21:48:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1680212909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mM5HwWlMeIbxDtgyoTwQTwBSj5tBPsq+CS04HqGn5n4=; b=J/SyiZlLTZf1CrYIrU4NmOBGohxd1ERT9C09ez0N6BPhXciu0HCfLt9F7651PehFzoCoHC iywdU1MKqMawohRvb/SQDCtxOZfpAITBWNI9W/5HRwYAPrhZGlvqYorWDfm5J+CTmL/xfF BW+ovEt6zrpLXJyo8yfOi0W4FMUAn3N0LW8Vt6oU8TmJ/Vv7FPRR4k50EIIUnE6wC0wBMg GDe8e3kVwg2IFhzGYCOfKDZ0ltOZq759SKsaH+1l7BmRziJ/Z9NWDFUOOd2taKkJ0Xr60I QWCvhhMpwwxgcUHznH1nwFxjEdbnbaWaGHL73ho/7BscQHIANKPNOtBi9+lMIQ== Date: Thu, 30 Mar 2023 23:48:18 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/zsh-egrep-failing-test.patch: New file. * gnu/packages/shells.scm (zsh): Patch it. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 3 ++- gnu/packages/patches/zsh-egrep-failing-test.patch | 11 +++++++++++ gnu/packages/shells.scm | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/zsh-egrep-failing-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 58437b7a0e..21f0993a3f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2040,7 +2040,8 @@ dist_patch_DATA = \ %D%/packages/patches/xterm-370-explicit-xcursor.patch \ %D%/packages/patches/xygrib-fix-finding-data.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \ - %D%/packages/patches/zig-use-system-paths.patch + %D%/packages/patches/zig-use-system-paths.patch \ + %D%/packages/patches/zsh-egrep-failing-test.patch MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in diff --git a/gnu/packages/patches/zsh-egrep-failing-test.patch b/gnu/packages/patches/zsh-egrep-failing-test.patch new file mode 100644 index 0000000000..10828ca6bb --- /dev/null +++ b/gnu/packages/patches/zsh-egrep-failing-test.patch @@ -0,0 +1,11 @@ +--- a/Test/E01options.ztst 2023-03-30 21:34:12.372309112 +0200 ++++ b/Test/E01options.ztst 2023-03-30 21:34:33.212335339 +0200 +@@ -649,7 +649,7 @@ + >noktarg1 + >0 1 + +- showopt() { setopt | egrep 'localoptions|ksharrays'; } ++ showopt() { setopt | grep -E 'localoptions|ksharrays'; } + f1() { setopt localoptions ksharrays; showopt } + f2() { setopt ksharrays; showopt } + setopt kshoptionprint diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 5ca8d842c2..26cbbe67dd 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -467,7 +467,8 @@ (define-public zsh ".tar.xz"))) (sha256 (base32 - "06crvpqbpm8sq5c215f4b985z7npwnqnj0i0g53hnq6fp8h3b5xn")))) + "06crvpqbpm8sq5c215f4b985z7npwnqnj0i0g53hnq6fp8h3b5xn")) + (patches (search-patches "zsh-egrep-failing-test.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags `("--with-tcsetpgrp"