From debbugs-submit-bounces@debbugs.gnu.org Fri May 03 08:03:00 2024 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: guile-tap: Update to 0.5.0. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit Cc: Frank Terbeck X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) * 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") -- 2.43.0 From debbugs-submit-bounces@debbugs.gnu.org Sun May 12 14:36:54 2024 Received: (at 70733-done) by debbugs.gnu.org; 12 May 2024 18:36:54 +0000 Received: from localhost ([127.0.0.1]:55826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6E43-0007m0-M0 for submit@debbugs.gnu.org; Sun, 12 May 2024 14:36:54 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6E3z-0007lq-Gb for 70733-done@debbugs.gnu.org; Sun, 12 May 2024 14:36:50 -0400 Received: from localhost (unknown [45.67.83.168]) by mira.cbaines.net (Postfix) with ESMTPSA id 52F8327BBE2; Sun, 12 May 2024 19:36:46 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id e13a7d34; Sun, 12 May 2024 18:36:45 +0000 (UTC) From: Christopher Baines To: Frank Terbeck Subject: Re: [bug#70733] [PATCH] gnu: guile-tap: Update to 0.5.0. In-Reply-To: <20240503112223.1726868-1-ft@bewatermyfriend.org> (Frank Terbeck's message of "Fri, 3 May 2024 13:22:23 +0200") References: <20240503112223.1726868-1-ft@bewatermyfriend.org> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Sun, 12 May 2024 19:36:42 +0100 Message-ID: <87o79a7u85.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70733-done Cc: 70733-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Frank Terbeck writes: > * 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(-) Thanks for the patch Frank, it looks good and I think substituting the full guile filename in tap-harness is correct. I've pushed it to master as d2b9736c5e4c87af8264304d528c517633a282aa. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZBDDpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfmoxAAuLAEgGk4IUF7JrK+Al/DwLWSAJhxjaMR FrQDuuyNE+ZhtDce61BrGLPMbdI47Px6gX7arNayp5HJstg+nX6+sPS2RlblN+d/ Gh82naDWGRsUB0+NSl0r9trNiNNe7POfIfRpvO4Te0RQ+9iMSxD6P9vuKQkPCqr4 O6KI4JpAc0rGRrkfcnw2SljgIIKO7C3Vbx9/gaPGxolejfaLcjJeyjmqiogdZHWm 0g6Ngc/r5WOEkvRJ0cnNExL/579G6LhaaRD3GINfO0cwmZlK8sKWk1aPj9SJDrzx cAI93XuQB9AGt2m6DAfGNQKzqas7qrQ/DlfrTQvYA1Y7T9Gd4V5HSSQcNSeG7FDm XL9xXsephAmfW3Dfm+L6u2sIxy8rqRsSAmd59mckYltn6/1P0eyPLu9ihNBDbYtQ lVI2zMwmyk6i3Y1548McMuI+MMbiyzFfUYoUtsLUPL7waIesMYp+KkJvpSlKiF2x 6zTMv2Wo7U/1E1W3f2aEUQh1RG+OfqJy0LThXVJZryUVGzQQZ7hXZ+BS+tJMQdZH qDwGAhIjBn4duXKCI8V1QiIl7DcqM8O70bqjnVYqPg9/BqOAJ73/f6GnQrhv3YOa 7rdGLzStMaD3Lufa+Gc0MgeyN+/hIt/8Gei1zTyXjau471gD+gNF9QZ51EIysmcn JnGDckLmu+c= =7MbM -----END PGP SIGNATURE----- --=-=-=-- From unknown Wed Jun 25 10:52:16 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 10 Jun 2024 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator