From patchwork Mon May 29 22:22:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: wrobell X-Patchwork-Id: 50486 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 51B9F27BBEA; Tue, 30 May 2023 09:43:14 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 6EFF227BBE2 for ; Tue, 30 May 2023 09:43:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3uwV-00034i-FK; Tue, 30 May 2023 04:42:59 -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 1q3sAL-0000bU-K3 for guix-patches@gnu.org; Tue, 30 May 2023 01:45:09 -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 1q3sAJ-0007J8-FX for guix-patches@gnu.org; Tue, 30 May 2023 01:45:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3sAJ-0000K5-Au for guix-patches@gnu.org; Tue, 30 May 2023 01:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63798] [PATCH] Fix Erlang package substitutions Resent-From: wrobell Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 May 2023 05:45:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63798@debbugs.gnu.org Cc: wrobell X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16854255001197 (code B ref -1); Tue, 30 May 2023 05:45:03 +0000 Received: (at submit) by debbugs.gnu.org; 30 May 2023 05:45:00 +0000 Received: from localhost ([127.0.0.1]:59858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3sAF-0000JE-4m for submit@debbugs.gnu.org; Tue, 30 May 2023 01:45:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:49776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3lGE-0002Mz-H8 for submit@debbugs.gnu.org; Mon, 29 May 2023 18:22:43 -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 1q3lGE-0003nA-AN for guix-patches@gnu.org; Mon, 29 May 2023 18:22:42 -0400 Received: from mx1.riseup.net ([198.252.153.129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3lGB-0008FL-DK for guix-patches@gnu.org; Mon, 29 May 2023 18:22:41 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4QVVQN6cW9zDqY4 for ; Mon, 29 May 2023 22:22:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1685398956; bh=ZdyHh6bLNrUPEu8ZJ4D9PPFeaeoTg9QHs3RJFddiR60=; h=From:To:Cc:Subject:Date:From; b=Y0A7pbU3oMQFSyWjhwCU9TSYCJ9pQuscICnt8AzPZ1zXByprsaLA6xsQTtVmI5wJy pH5TcwZ7xz0fg7IFVcCAaIJNxpWyXBsQIWyxwOOaYIHEfAgPWcvr/2gfwF7ARYAwn9 k8PjhQEP9r9BQemOmR4bartA4VYKo52uEHafmPoo= X-Riseup-User-ID: D9E1FCC6F952D03DB6DB184F32A0B1F2C6AB61DB8ADD71E538F9A3114E21CC5B Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4QVVQN082mzFqgp; Mon, 29 May 2023 22:22:35 +0000 (UTC) From: wrobell Date: Mon, 29 May 2023 23:22:24 +0100 Message-Id: <6aefc528753b5e46753ed8f70c5a062b9a1cd8ef.1685397780.git.wrobell@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.129; envelope-from=wrobell@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 30 May 2023 01:44:54 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 30 May 2023 04:42:58 -0400 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 Both `dirname` and `basename` need to be substituted. There is no need for `sed` substitution in Erlag 25.3. --- gnu/packages/erlang.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) base-commit: 7b400e7f8751e6b0cc6e66d3f7ecfb7f5bd51309 diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 7564c2a560..b6e82e0109 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2021 Oskar Köök ;;; Copyright © 2021 Cees de Groot ;;; Copyright © 2022 jgart +;;; Copyright © 2023 wrobell ;;; ;;; This file is part of GNU Guix. ;;; @@ -168,7 +169,8 @@ (define-public erlang (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* (string-append out "/bin/erl") - (("sed") (which "sed")))))) + (("basename") (which "basename")) + (("dirname") (which "dirname")))))) (add-after 'install 'install-doc (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))