From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 6E1AFusDJmR0sQAASxT56A (envelope-from ) for ; Thu, 30 Mar 2023 23:49:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id ALIFFusDJmQAcgAAauVa8A (envelope-from ) for ; Thu, 30 Mar 2023 23:49:31 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2C3A613F86 for ; Thu, 30 Mar 2023 23:49:31 +0200 (CEST) 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 Content-Transfer-Encoding: 8bit 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 From: Josselin Poiret via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680212971; a=rsa-sha256; cv=none; b=WYHIpzSXYQW4xdl9s8dMzAfGck/+q1rziK3NVpOQvbq2Iq6mzvUSr3JLhBI4s0/4rjYZIF mEtVwr3twmDX79KY2ixF2DxO2yZfmvI3D5Po1rYVz2GLIvf8OHrBFLj0GEoHf8923V0IHR LRGszubXUnwHN0u2pRa6NUkSbMJgEPWEQ240d8I95gL960tuH1ca3HUoxpvF043J0A8oFA K4MX6oF4Sv2NHGYPN60BkCY9kdreKwwEzUvYLqNL/LUut7KSKAnPoZD4zGS4EE1G/2NrG8 FjFhgDC0jC2SW4T8ntTyDH1rGnW7Wvdo0x8dyJxIDNB7RSKvzqvzIqYykFb+NQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b="J/SyiZlL"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680212971; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=mM5HwWlMeIbxDtgyoTwQTwBSj5tBPsq+CS04HqGn5n4=; b=Fi1UK9Se01tH3R4wBpmKtrMJgQjCMdtcZyxI0QMH8NuvHL5tHaOuYaQcSsMt8B0SjY95JE LgxYyJ6UIEHtHqzc46SWmxES3BGUZfBDcTlSEUJSWs8DKCr0JuXyriqn1tkPOmIWTrK7/X Fm4wGsmq0/cvmQUY3p7067bRy5bGPB4PVG44334f2rmj3/j4cI0x0jquotIITiHerLnp2v R1BNZWWBeUaDNs/5L/53TGKTaDTdKJkSwuj5H3x55w9rWzDARhZuixG8Yw8mhj2XrSik7B 4544lces0uDFqCngNm//P6CJ/aQ1VqojbW9lroivXui04KootRX15/EcQgTpbA== X-Migadu-Spam-Score: -2.22 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b="J/SyiZlL"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Spam-Score: -2.22 X-Migadu-Queue-Id: 2C3A613F86 X-TUID: ghQDDRX/70LH * 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" -- 2.39.2