~ruther/guix-local

cebcf3533ab83233121434254a6ae7b8c35cfa1f — Josselin Poiret 3 years ago 7f7532a
gnu: zsh: Patch failing test that uses egrep.

* 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.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
3 files changed, 15 insertions(+), 2 deletions(-)

M gnu/local.mk
A gnu/packages/patches/zsh-egrep-failing-test.patch
M gnu/packages/shells.scm
M gnu/local.mk => gnu/local.mk +2 -1
@@ 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

A gnu/packages/patches/zsh-egrep-failing-test.patch => gnu/packages/patches/zsh-egrep-failing-test.patch +11 -0
@@ 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

M gnu/packages/shells.scm => gnu/packages/shells.scm +2 -1
@@ 467,7 467,8 @@ history mechanism, job control and a C-like syntax.")
                           ".tar.xz")))
              (sha256
               (base32
                "06crvpqbpm8sq5c215f4b985z7npwnqnj0i0g53hnq6fp8h3b5xn"))))
                "06crvpqbpm8sq5c215f4b985z7npwnqnj0i0g53hnq6fp8h3b5xn"))
              (patches (search-patches "zsh-egrep-failing-test.patch"))))
    (build-system gnu-build-system)
    (arguments `(#:configure-flags
                 `("--with-tcsetpgrp"