From patchwork Tue Feb 1 19:16:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cees de Groot X-Patchwork-Id: 36928 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 4414F27BBEA; Tue, 1 Feb 2022 23:56:06 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 0F55A27BBE9 for ; Tue, 1 Feb 2022 23:56:06 +0000 (GMT) Received: from localhost ([::1]:55950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF30H-0006sY-7U for patchwork@mira.cbaines.net; Tue, 01 Feb 2022 18:56:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEyfH-0002gU-M0 for guix-patches@gnu.org; Tue, 01 Feb 2022 14:18:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nEyfC-0000Zp-Cm for guix-patches@gnu.org; Tue, 01 Feb 2022 14:18:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nEyfC-0000B1-9t for guix-patches@gnu.org; Tue, 01 Feb 2022 14:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53708] [PATCH] Fix Elixir substitution error Resent-From: Cees de Groot Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Feb 2022 19:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53708@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.1643743048605 (code B ref -1); Tue, 01 Feb 2022 19:18:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Feb 2022 19:17:28 +0000 Received: from localhost ([127.0.0.1]:44141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEyee-00009h-H0 for submit@debbugs.gnu.org; Tue, 01 Feb 2022 14:17:28 -0500 Received: from lists.gnu.org ([209.51.188.17]:41682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEyed-00009T-0Q for submit@debbugs.gnu.org; Tue, 01 Feb 2022 14:17:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEyeb-00029X-L8 for guix-patches@gnu.org; Tue, 01 Feb 2022 14:17:26 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:26718) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEyeR-0000UG-Aa for guix-patches@gnu.org; Tue, 01 Feb 2022 14:17:21 -0500 Date: Tue, 01 Feb 2022 19:16:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=evrl.com; s=protonmail3; t=1643743014; bh=18kzYsG6VFp6TKnmHNt9Nbu93E4qkc17ZhNKhi69L80=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=Futx7RGU7ZI9zihGLEHXByrbLeYYCDdUNS26F462jyfSbdB2kOqDhDGz2onNkTOJ1 wGtLxhkPgwoeuvMQeYn5MXzCviAKP8rR4AxcNpfY3uT60vLYBPwDFgkd04RWKeW4yl 3m8+vjq3QPIYcrmRHsQ2Ah2bx1n5QUbaJbJRi0bA34Gzl5CjAZOCGRv9sYZTHo5SNg YyjgWrQCZXdYIAHgz+fxjT9wpYeUlV/Z6ki7GDAfQVgvIb6jj0zPcZUbQZFq7lU1gA ni7uizZu7v+mJfaY88V3u+0+o45eOBLIaVks0QvzBmtAMnAwOAzLhYGFWU1cXbZAB1 lVabkgNwOp+EA== From: Cees de Groot Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.23; envelope-from=cg@evrl.com; helo=mail-4323.proton.ch 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Reply-To: Cees de Groot Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From d9860a374c5b6e5b992439a232e6897bfde1e334 Mon Sep 17 00:00:00 2001 From: Cees de Groot Date: Tue, 1 Feb 2022 14:12:17 -0500 Subject: [PATCH] Fix regex for ERTS_BIN substitution in Elixir Something must have gone wrong during testing of the ELixir 1.13.2 patch I submitted last week. Apart from #53707, I also found out that the whole substitution regex did not work. This works better - it is still more brittle than I like, but apparently `substitute*` does not work with fully anchored regexes. --- gnu/packages/elixir.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.34.0 diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index fae8279e5c..55e17f2901 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -70,7 +70,7 @@ (define-public elixir (("#!/bin/sh") (string-append "#!" (search-input-file inputs "/bin/sh")))) (substitute* "bin/elixir" - (("^ERTS_BIN=$") + (("ERTS_BIN=\n") (string-append "ERTS_BIN=" ;; Elixir Releases will prepend to ERTS_BIN the path of