all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Simon Tournier <zimon.toutoune@gmail.com>
To: 62796@debbugs.gnu.org
Cc: Simon Tournier <zimon.toutoune@gmail.com>
Subject: [bug#62796] [PATCH core-updates v2 1/2] gnu: ocaml-ppxlib: Fix tests.
Date: Wed, 12 Apr 2023 19:09:39 +0200	[thread overview]
Message-ID: <20230412170940.3333419-1-zimon.toutoune@gmail.com> (raw)
In-Reply-To: <20230412160010.3232633-1-zimon.toutoune@gmail.com>

* gnu/packages/ocaml.scm (ocaml-ppxlib)[arguments]: Substitue obsolete 'egrep'
by 'grep -E'.
---
 gnu/packages/ocaml.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index c6dca2874f..f1c4e35044 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6660,7 +6660,12 @@ (define-public ocaml-ppxlib
              (substitute* "test/ppx_import_support/test.ml"
                (("\\(Failure") "Failure")
                (("  \"(Some ppx-es.*)\")" _ m)
-                (string-append " \"" m "\"."))))))))
+                (string-append " \"" m "\".")))))
+         (add-after 'fix-test-format 'fix-egrep
+           (lambda _
+             ;; egrep is obsolescent; using grep -E
+             (substitute* "test/expansion_context/run.t"
+               (("egrep") "grep -E")))))))
     (propagated-inputs
      (list ocaml-compiler-libs
            ocaml-ppx-derivers

base-commit: a3bfb867380f1e5ce157334d7d9877297ef509ab
-- 
2.38.1





  parent reply	other threads:[~2023-04-12 17:10 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-12 16:00 [bug#62796] [PATCH core-updates] gnu: ocaml-ppxlib: Fix tests Simon Tournier
2023-04-12 17:08 ` Simon Tournier
2023-04-12 17:09 ` Simon Tournier [this message]
2023-04-12 17:09   ` [bug#62796] [PATCH core-updates v2 2/2] gnu: ocaml-mdx: " Simon Tournier
2023-04-12 19:54     ` bug#62796: " Julien Lepiller

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

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

  git send-email \
    --in-reply-to=20230412170940.3333419-1-zimon.toutoune@gmail.com \
    --to=zimon.toutoune@gmail.com \
    --cc=62796@debbugs.gnu.org \
    /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 external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.