unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Josselin Poiret via Guix-patches via <guix-patches@gnu.org>
To: Josselin Poiret <dev@jpoiret.xyz>
Cc: 62553@debbugs.gnu.org
Subject: [bug#62553] [PATCH core-updates 6/6] gnu: zsh: Patch failing test that uses egrep.
Date: Thu, 30 Mar 2023 23:48:18 +0200	[thread overview]
Message-ID: <fa4d0810e13159c65aec90b5e7ec8d7506abc5a5.1680212316.git.dev@jpoiret.xyz> (raw)
In-Reply-To: <cover.1680212316.git.dev@jpoiret.xyz>

* 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





  parent reply	other threads:[~2023-03-30 21:49 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-30 21:44 [bug#62553] [PATCH core-updates 0/6] Various fixes to packages Josselin Poiret via Guix-patches via
2023-03-30 21:48 ` [bug#62553] [PATCH core-updates 1/6] gnu: Replace all uses of atk by at-spi2-core Josselin Poiret via Guix-patches via
2023-03-30 21:48 ` [bug#62553] [PATCH core-updates 2/6] gnu: atkmm: Update to 2.36.2 Josselin Poiret via Guix-patches via
2023-03-30 21:48 ` [bug#62553] [PATCH core-updates 3/6] gnu: atk: Deprecate in favor of at-spi2-core Josselin Poiret via Guix-patches via
2023-03-30 21:48 ` [bug#62553] [PATCH core-updates 4/6] gnu: gpgme: Propagate libassuan Josselin Poiret via Guix-patches via
2023-03-30 21:48 ` [bug#62553] [PATCH core-updates 5/6] gnu: Remove gpgme-1.18 and qgpgme-1.18 Josselin Poiret via Guix-patches via
2023-03-30 21:48 ` Josselin Poiret via Guix-patches via [this message]
2023-03-31 14:57 ` bug#62553: [PATCH core-updates 0/6] Various fixes to packages Guillaume Le Vaillant

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fa4d0810e13159c65aec90b5e7ec8d7506abc5a5.1680212316.git.dev@jpoiret.xyz \
    --to=guix-patches@gnu.org \
    --cc=62553@debbugs.gnu.org \
    --cc=dev@jpoiret.xyz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).