From patchwork Wed Apr 12 16:00:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 49106 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 81DCC174BB; Wed, 12 Apr 2023 17:02:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7E82F174A9 for ; Wed, 12 Apr 2023 17:02:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmcuF-000684-NU; Wed, 12 Apr 2023 12:01:11 -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 1pmcuC-00063J-Iv for guix-patches@gnu.org; Wed, 12 Apr 2023 12:01:10 -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 1pmcuC-0007vB-B4 for guix-patches@gnu.org; Wed, 12 Apr 2023 12:01:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmcu6-00005h-MZ; Wed, 12 Apr 2023 12:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62796] [PATCH core-updates] gnu: ocaml-ppxlib: Fix tests. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: pukkamustard@posteo.net, julien@lepiller.eu, andreas@enge.fr, guix-patches@gnu.org Resent-Date: Wed, 12 Apr 2023 16:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62796 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62796@debbugs.gnu.org Cc: Simon Tournier , pukkamustard@posteo.net, julien@lepiller.eu, andreas@enge.fr X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: pukkamustard@posteo.net, julien@lepiller.eu, andreas@enge.fr Received: via spool by submit@debbugs.gnu.org id=B.168131522728528 (code B ref -1); Wed, 12 Apr 2023 16:01:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Apr 2023 16:00:27 +0000 Received: from localhost ([127.0.0.1]:41129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmctX-0007Ou-4u for submit@debbugs.gnu.org; Wed, 12 Apr 2023 12:00:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:48086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmctU-0007Gx-Gh for submit@debbugs.gnu.org; Wed, 12 Apr 2023 12:00:25 -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 1pmctU-0005p7-3e for guix-patches@gnu.org; Wed, 12 Apr 2023 12:00:24 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pmctS-0007cl-BR for guix-patches@gnu.org; Wed, 12 Apr 2023 12:00:23 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f0968734f6so1794305e9.0 for ; Wed, 12 Apr 2023 09:00:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681315218; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vmjrH5WUUDN65DueF87Exgu5ii/7ouOOXjy8H3JFICw=; b=stQWXTFahdQaBr9uJHYe4/NoRgu0XMLf2hKOzMg5EfaFuyIKgAM79IfmXCTxy0i5AY +PPPg6cqHWPdBRrJxFNehWn4D44gw/KXA1ib/adLMTowvWhyCVvQi4PiWzlzhOTqKHLh JsJVS20hOUsGF6EKGVQZ5ZTecSMSgLCeDWGx7XY8htC1S4QviAu8ouOssmE9sTK3UTut 0Yl+3C3TDo+rMXM0XHmSW2WprpOkSAZsXam6tY5JR5Gqr7tNFvFsT+hS10YfBpKPrecr DA+21fi7uD35Z9SSkYUJ+K280t125e6sUapmtcZyGNmE0LHKSS+POXZPeVfN7iYOLXzi eePg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681315218; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vmjrH5WUUDN65DueF87Exgu5ii/7ouOOXjy8H3JFICw=; b=ai0Y02XgNyPtxQtOQ6CCbZfSGDRwJTQRiFSMN1sLRKkT6jnq4wudj3HahSxJkO4LfB HNscz3W3s7ZOCEhyJFKEQ08ZFAlYss+GlkQKIviTbyEaLmp2eMKsLJY87InW7l48aX8t tYf3zYKSlmBrNKF0LCZgRsfGhF02SONsrJK9Cp2UDNPUcba9CJ6fn+EtxO7kNkjIXj/Z IdpQwMt6QL6N5PeIAGIaQ7XJy5cPuPNZ3YStONFjIKwO3IiRoa2ehorHQpfDQgNzBWna 61WDvCmLWFA1oDK7PZAzEkqaktXSdq8toC7Uc2L1EbEy0mkiWDFCw5ZVdknj8Ex0EJEk f2Bw== X-Gm-Message-State: AAQBX9ejl2Poabt7lxIb+UEUQ2o/XOxrr7T6lCkKoAYxfbNIYLL3JQlM yTHAYpVEO+M07tNYSsck+hwSM3PNNMI= X-Google-Smtp-Source: AKy350bfvS7725cGuq5J1Ofb536+nNHtHKy2RZRq6yzmvf69K8QoXn0ml+fywbI2GPc7R8O9sIkKMA== X-Received: by 2002:a05:600c:c0e:b0:3f0:7652:dbb8 with SMTP id fm14-20020a05600c0c0e00b003f07652dbb8mr2594066wmb.2.1681315217732; Wed, 12 Apr 2023 09:00:17 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id i19-20020a1c5413000000b003edf2ae2432sm2815440wmb.7.2023.04.12.09.00.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 09:00:17 -0700 (PDT) From: Simon Tournier Date: Wed, 12 Apr 2023 18:00:10 +0200 Message-Id: <20230412160010.3232633-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=zimon.toutoune@gmail.com; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) Hi, This fixes a regression when updating grep. Cheers, simon base-commit: a3bfb867380f1e5ce157334d7d9877297ef509ab 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