From patchwork Fri May 3 11:22:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Terbeck X-Patchwork-Id: 63795 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 22D5227BBEA; Fri, 3 May 2024 14:12:49 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 26EAE27BBE9 for ; Fri, 3 May 2024 14:12:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2shs-0000ar-Id; Fri, 03 May 2024 09:12:08 -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 1s2rce-00051Z-F3 for guix-patches@gnu.org; Fri, 03 May 2024 08:02:40 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2rce-0004Sp-6c for guix-patches@gnu.org; Fri, 03 May 2024 08:02:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s2rd0-00007q-9P for guix-patches@gnu.org; Fri, 03 May 2024 08:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70733] [PATCH] gnu: guile-tap: Update to 0.5.0. Resent-From: Frank Terbeck Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2024 12:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70733 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70733@debbugs.gnu.org Cc: Frank Terbeck X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1714737781472 (code B ref -1); Fri, 03 May 2024 12:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 May 2024 12:03:01 +0000 Received: from localhost ([127.0.0.1]:46410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2rcy-00007X-JG for submit@debbugs.gnu.org; Fri, 03 May 2024 08:03:00 -0400 Received: from lists.gnu.org ([2001:470:142::17]:56628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2rcu-00007P-TS for submit@debbugs.gnu.org; Fri, 03 May 2024 08:02: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 1s2rcS-000509-Fd for guix-patches@gnu.org; Fri, 03 May 2024 08:02:28 -0400 Received: from smtprelay01.ispgateway.de ([80.67.31.39]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s2rcQ-0004Nz-FW for guix-patches@gnu.org; Fri, 03 May 2024 08:02:28 -0400 Received: from [62.155.193.191] (helo=jim.voodoo.lan) by smtprelay01.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1s2r0O-000000006tD-3h05; Fri, 03 May 2024 13:23:08 +0200 Received: by jim.voodoo.lan (Postfix, from userid 1000) id 2B2E060D976; Fri, 03 May 2024 13:22:54 +0200 (CEST) From: Frank Terbeck Date: Fri, 3 May 2024 13:22:23 +0200 Message-ID: <20240503112223.1726868-1-ft@bewatermyfriend.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Df-Sender: NDMwNDQ0 Received-SPF: none client-ip=80.67.31.39; envelope-from=ft@jim.voodoo.lan; helo=smtprelay01.ispgateway.de X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NO_DNS_FOR_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Fri, 03 May 2024 09:12:07 -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 * gnu/packages/guile-xyz.scm (guile-tap): Update to 0.5.0 Signed-off-by: Frank Terbeck Change-Id: Ia8a02400f1d559fcec7eb9861f24a7116928814b --- This is my first contribution to Guix. I am the upstream for guile-tap, and was positively surprised by "guix refresh". Good stuff! This is basically the result of that. Additionally, I've added a "substitute*" call for bin/tap-harness, to replace the raw "guile" call in it with the full binary name via the "which" utility. This is analogous to the shebang-rewriting that the Guix does by default. This is done because bin/tap-harness used to be a program that had guile in it's shebang line, but now it is a shell script that calls out to guile. I am not sure if this is best practise, but I figured if this is done for shebang lines, it should be correct for raw calls to an interpreter line this as well. gnu/packages/guile-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9534341b70..875fe7ee24 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -6124,7 +6124,7 @@ (define-public lokke (define-public guile-tap (package (name "guile-tap") - (version "0.4.6") + (version "0.5.1") (source (origin (method git-fetch) (uri (git-reference @@ -6133,7 +6133,7 @@ (define-public guile-tap (file-name (git-file-name name version)) (sha256 (base32 - "04ip5cbvsjjcicsri813f4711yh7db6fvc2px4788rl8p1iqvi6x")))) + "0yimi9ci5h6wh7bs3ir7p181pwbd2hxlhx7pqq53gr54mnad8qv4")))) (build-system gnu-build-system) (arguments (list #:phases @@ -6142,7 +6142,9 @@ (define-public guile-tap (lambda _ (substitute* "Makefile" (("PREFIX = /usr/local") (string-append "PREFIX=" - #$output))))) + #$output))) + (substitute* "bin/tap-harness" + ((" guile ") (string-append " " (which "guile") " "))))) (replace 'build (lambda _ (invoke "make")