GNU bug report logs - #62553
[PATCH core-updates 0/6] Various fixes to packages

Previous Next

Full log

Message #23 received at 62553 <at> debbugs.gnu.org (full text, mbox):

From: Josselin Poiret <dev <at> jpoiret.xyz>
To: Josselin Poiret <dev <at> jpoiret.xyz>
Cc: 62553 <at> debbugs.gnu.org
Subject: [PATCH core-updates 6/6] gnu: zsh: Patch failing test that uses egrep.
Date: Thu, 30 Mar 2023 23:48:18 +0200

* 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.