From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 4GA9LCOaz2OqNwAAbAwnHQ (envelope-from ) for ; Tue, 24 Jan 2023 09:43:15 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id OMhaLCOaz2Ne2gAA9RJhRA (envelope-from ) for ; Tue, 24 Jan 2023 09:43:15 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 27D812F6C2 for ; Tue, 24 Jan 2023 09:43:14 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pKEtZ-0001lF-Ml; Tue, 24 Jan 2023 03:43:09 -0500 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 1pKEtU-0001kw-8H for guix-patches@gnu.org; Tue, 24 Jan 2023 03:43:05 -0500 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 1pKEtS-00012s-Bz for guix-patches@gnu.org; Tue, 24 Jan 2023 03:43:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pKEtS-00038j-86 for guix-patches@gnu.org; Tue, 24 Jan 2023 03:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60868] [PATCH v2] build: pyproject-build-system: Use wrap-script instead of wrap-program. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Jan 2023 08:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60868 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: jgart , 60868@debbugs.gnu.org, Lars-Dominik Braun Received: via spool by 60868-submit@debbugs.gnu.org id=B60868.167454976812036 (code B ref 60868); Tue, 24 Jan 2023 08:43:02 +0000 Received: (at 60868) by debbugs.gnu.org; 24 Jan 2023 08:42:48 +0000 Received: from localhost ([127.0.0.1]:55799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKEtD-000384-Ih for submit@debbugs.gnu.org; Tue, 24 Jan 2023 03:42:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKEtB-00037q-Mx for 60868@debbugs.gnu.org; Tue, 24 Jan 2023 03:42:46 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pKEt5-0000zm-3Y; Tue, 24 Jan 2023 03:42:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=voNNKU9pvGEPrve70udyKrrQ8U3DEYFd7i0GmBnxebk=; b=AzxrCXc81N/0iXTaIGa2 ImS2NDe7R3RDpkqgxTzoOvnytTHDfvG8fHkHDSp0BKz8dE18FeKxLzGSSJelE95sZAUNlOTnVyST/ aUPZwqU6UzygvDQ6rNgR8o8QcVNdArEf+CH3ej7YhTYQkON0sBVo5e9f+u8RIS7jLW8MGdiQo2q7P s2i+crcRkDAVUriCUUkfhCW3ZSRIjZTg7ctaJLkYCcstxnja3W6+YnT9Ok7iJ8LuJ2048hh30QVZ0 GuBBPnFUPUk5coEGCjJhxR/eB0O9vBL5yBEd871hTgpwmZg4b6GEuzMxzerq5sY56am+HBHJmjcs+ T1TpePItT4LBWA==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pKEt4-0008F1-K0; Tue, 24 Jan 2023 03:42:38 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20230123133354.1345-1-maxim.cournoyer@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Quintidi 5 =?UTF-8?Q?Pluvi=C3=B4se?= an 231 de la =?UTF-8?Q?R=C3=A9volution,?= jour du Taureau X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 24 Jan 2023 09:42:35 +0100 In-Reply-To: <20230123133354.1345-1-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Mon, 23 Jan 2023 08:33:54 -0500") Message-ID: <87y1pswcg4.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1674549795; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=voNNKU9pvGEPrve70udyKrrQ8U3DEYFd7i0GmBnxebk=; b=kFSroUh3jyUKa8rSNUkhlDlOq51eb9MZBNZpAbKbmakxrE+RZxWrf5OPiGpBeL0ty93fOY jmrnAhhltEhuYsetvMWz0TPCA2pW5qcOt+gPr67dL8HuPmGRupf87S+zgXZD0xxPZ90ZgA b+7Nb56DldtOL0jrDKiKKiflkfkWmef3ACGviCwcfpdUkhSRIFSrG1aRziCUdCSSK+gfXe sDwjje6x8MGpVUi0PAT7JGn5sQrGLFUWjylobyNZDrApme9d6Or6AmzZL5zKeYB6s/18X+ zBsZCdK/qoD/G47c6qH6bBecW9++7WHp23xrAp2GTyLc6PfdWBu2rQIyXidbMw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=AzxrCXc8; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1674549795; a=rsa-sha256; cv=none; b=LSL1wNYvsavrzVK8VAhLgaZHoNJ1IjhC7UDBlkfOWTj6PSwlhe+p9BtSzX1BVpPxbo4vAn 7xqvIc8RWZ+dJWQ5AeskgezEN1xoXNzNtvHVoIHnkVazR5bANHF5KOhVs6+6fcveinUF3o GLwRhpRhdyNEtlYBCTXBiy0dLHZfequ7zOF/1BH3K9gW6qXFTEuCwPHtlzWxAkPKEzzZEL 9nSK5nRiPS+MVoRq/s+Y6aGcxgUKov10V44Ks1AzQpdiXGvezJ1Cvz3NzYlZZtiKYylnZp 3pKib5zfwKOLu4wuBosXdIru3YOTXOLaZ1ZXZXSOi/IPZqe1UMasc0iielaAog== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=AzxrCXc8; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-Migadu-Spam-Score: -0.99 X-Spam-Score: -0.99 X-Migadu-Queue-Id: 27D812F6C2 X-TUID: Qqc3uGrtKd1i Hello! Maxim Cournoyer skribis: > * guix/build-system/pyproject.scm (default-guile): New procedure. > (lower) Add guile to the host-inputs of the bag. > * guix/build/pyproject-build-system.scm (wrap): Replace wrap-program with > wrap-script. Rename bash-related nested variables/procedure with > guile-related ones. I had overlooked this patch before, sorry about that. > + (host-inputs (modify-inputs inputs > + (append (default-guile)))) Maybe add a comment stating it=E2=80=99s for =E2=80=98wrap-script=E2=80=99. > + (define bindirs > + (append-map (match-lambda > + ((_ . dir) > + (list (string-append dir "/bin") > + (string-append dir "/sbin")))) > + outputs)) Should it include =E2=80=9Clibexec=E2=80=9D? > + ;; Do not require "guile" to be present in the package inputs > + ;; even when there is nothing to wrap. > + ;; Also, calculate (guile) only once to prevent some I/O. > + (define %guile (delay (search-input-file inputs "bin/guile"))) > + (define (guile) (force %guile)) Aaah, got it. :-) LGTM, thanks! Ludo=E2=80=99.