GNU logs - #60868, boring messages

Message sent to guix-patches@HIDDEN:

Subject: [bug#60868] [PATCH] build: pyproject-build-system: Use wrap-script instead of wrap-program.
Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 16 Jan 2023 20:38:02 +0000
Resent-Message-ID: <handler.60868.B.16739014582889 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 60868 <at> debbugs.gnu.org
Cc: jgart <jgart@HIDDEN>, Lars-Dominik Braun <lars@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Date: Mon, 16 Jan 2023 15:37:11 -0500
Message-Id: <20230116203711.2214-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::82f;
 envelope-from=maxim.cournoyer@HIDDEN; helo=mail-qt1-x82f.google.com
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, FREEMAIL_FROM=0.001,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

* 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.
---

 guix/build-system/pyproject.scm       |  9 +++++++-
 guix/build/pyproject-build-system.scm | 30 ++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm
index 74d739023f..8b5091c654 100644
--- a/guix/build-system/pyproject.scm
+++ b/guix/build-system/pyproject.scm
@@ -59,6 +59,12 @@ (define (default-python)
   (let ((python (resolve-interface '(gnu packages python))))
     (module-ref python 'python-toolchain)))

+(define (default-guile)
+  "Return the default Guile used to wrap Python scripts."
+  ;; Lazily resolve the binding to avoid a circular dependency.
+  (let ((guile (resolve-interface '(gnu packages guile))))
+    (module-ref guile 'guile-3.0)))
+
 (define sanity-check.py
   ;; TODO: Merge with sanity-check.py in the next rebuild cycle.
   (search-auxiliary-file "python/sanity-check-next.py"))
@@ -88,7 +94,8 @@ (define private-keywords
                           '())
                     ;; Keep the standard inputs of 'gnu-build-system'.
                     ,@(standard-packages)))
-    (host-inputs inputs)
+    (host-inputs (modify-inputs inputs
+                   (append (default-guile))))
     (target-inputs (if target
                        (standard-cross-packages target 'target)
                        '()))
diff --git a/guix/build/pyproject-build-system.scm b/guix/build/pyproject-build-system.scm
index e51b5cfc43..a66c1fb34a 100644
--- a/guix/build/pyproject-build-system.scm
+++ b/guix/build/pyproject-build-system.scm
@@ -445,9 +445,33 @@ (define* (add-install-to-pythonpath #:key native-inputs outputs
   "A phase that just wraps the 'add-installed-pythonpath' procedure."
   (add-installed-pythonpath native-inputs outputs))

-(define* (wrap #:key native-inputs outputs #:allow-other-keys #:rest args)
-  (apply (assoc-ref python:%standard-phases 'wrap)
-         (append args (list #:inputs native-inputs))))
+(define* (wrap #:key inputs outputs #:allow-other-keys)
+  (define (list-of-files dir)
+    (find-files dir (lambda (file stat)
+                      (and (eq? 'regular (stat:type stat))
+                           (not (wrapped-program? file))))))
+
+  (define bindirs
+    (append-map (match-lambda
+                  ((_ . dir)
+                   (list (string-append dir "/bin")
+                         (string-append dir "/sbin"))))
+                outputs))
+
+  ;; 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))
+
+  (let* ((var `("GUIX_PYTHONPATH" prefix
+                ,(search-path-as-string->list
+                  (or (getenv "GUIX_PYTHONPATH") "")))))
+    (for-each (lambda (dir)
+                (let ((files (list-of-files dir)))
+                  (for-each (cut wrap-script <> #:guile (guile) var)
+                            files)))
+              bindirs)))

 (define* (rename-pth-file #:key name native-inputs outputs #:allow-other-keys
                           #:rest args)

base-commit: 6c2d3eb8aef45381961ad4e8cf0d03ccbf2bbd64
-- 
2.38.1

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: bug#60868: Acknowledgement ([PATCH] build: pyproject-build-system:
 Use wrap-script instead of wrap-program.)
Message-ID: <handler.60868.B.16739014582889.ack <at> debbugs.gnu.org>
References: <20230116203711.2214-1-maxim.cournoyer@HIDDEN>
X-Gnu-PR-Message: ack 60868
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 60868 <at> debbugs.gnu.org
Date: Mon, 16 Jan 2023 20:38:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 60868 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
60868: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D60868
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message received at control <at> debbugs.gnu.org:

Received: (at control) by debbugs.gnu.org; 17 Jan 2023 15:50:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jan 17 10:50:13 2023
Received: from localhost ([127.0.0.1]:38008 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pHoE0-0005zi-T0
	for submit <at> debbugs.gnu.org; Tue, 17 Jan 2023 10:50:13 -0500
Received: from mail-qt1-f172.google.com ([209.85.160.172]:47069)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1pHoDw-0005zD-Cg
 for control <at> debbugs.gnu.org; Tue, 17 Jan 2023 10:50:11 -0500
Received: by mail-qt1-f172.google.com with SMTP id x7so17370866qtv.13
 for <control <at> debbugs.gnu.org>; Tue, 17 Jan 2023 07:50:08 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
 h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id
 :reply-to; bh=J/8C08DuvOQFRDlUenEz1Qp0/n3y3KLbtRLmlElHxqg=;
 b=LOXelXRD3XOJePmM2dG/U1lisfilLyZVH1JsEj/tNUOIEiYi8go1Uvm3szZIxmGVOC
 W/ZvMl3ku2IRc8J6NRW/hjfEXxNE1GycNdATWrFJhhGjaWjn1cwwz4AfvAyj5Ovhnd3m
 awvgsjyKeHpaoHaD05TOMdBikcgxxHwOjsn1mk1T74PHdPKuWulffXsRnyPFnAQdnU2U
 q5UK8dAMHhuWXwdaDaCEj560qwdMyyKqEypEFmyP81cAztSq+fV2QpD5Kk9tsKGG1usT
 HODgxvP2i7iczhevpffoE58NfBhmulUjDufvS8/TxKPnJUYDADZSrMiiVrQlGVsAHI44
 tJbg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112;
 h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=J/8C08DuvOQFRDlUenEz1Qp0/n3y3KLbtRLmlElHxqg=;
 b=G3pYSRKSAse3UR1KQa4P+IcxF673mq/6QRcgb1HXNHpqnBiTyZf64BNNcC3iMekOil
 13m8dPdrBCoqsvEbbaZBEQaICCDxvs6o1hJ2vBQ9l4wLMSJZvuxnxouUTbANK2c/wOlS
 nP07fUtDtclFk086DpK9zPVQrg5OX8wajbDQSwjSRcuLZfIIvikLnZ3pwTXVXemA7la0
 W91Cv9RFWYhNBmTBb1l88LpDJuDM3UM1IgVU7zvQ/l9v1PlFLuyg2kmTDssUWiy37XKW
 V2LdQ7rDI21dX3VH+CnCH9pKEl+I39cMSXHkK6SddTjD+6WEeP7F2hQ1vMt4iWolnwEq
 6LSQ==
X-Gm-Message-State: AFqh2kpz6ogQjSQxackmf5JsSeqd3i/q/wwip4SnY0YQCEQ89tV0PPbe
 W7GOo56b5CjVjlmEI3gau0/06kU4VE+6EtoN
X-Google-Smtp-Source: AMrXdXvO4gqH2PTW2mKASJwFcuOWiww6wsthe/h9bqVzkrFQrMHG31+m3i4klDi+1vDccDjTNpCWNw==
X-Received: by 2002:ac8:5a88:0:b0:3b1:4a8:4665 with SMTP id
 c8-20020ac85a88000000b003b104a84665mr6322909qtc.62.1673970602844; 
 Tue, 17 Jan 2023 07:50:02 -0800 (PST)
Received: from hurd (dsl-205-233-125-107.b2b2c.ca. [205.233.125.107])
 by smtp.gmail.com with ESMTPSA id
 t39-20020a05622a182700b003b63b20314esm1546415qtc.57.2023.01.17.07.50.02
 for <control <at> debbugs.gnu.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Tue, 17 Jan 2023 07:50:02 -0800 (PST)
Date: Tue, 17 Jan 2023 10:50:01 -0500
Message-Id: <874jsp2mae.fsf@HIDDEN>
To: control <at> debbugs.gnu.org
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: control message for bug #60868
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: control
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

block 60868 by 60849
quit

Message sent to guix-patches@HIDDEN:

Subject: [bug#60868] [PATCH] build: pyproject-build-system: Use wrap-script instead of wrap-program.
Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 17 Jan 2023 15:53:02 +0000
Resent-Message-ID: <handler.60868.B60868.167397074123274 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 60868 <at> debbugs.gnu.org
Cc: Lars-Dominik Braun <lars@HIDDEN>, jgart <jgart@HIDDEN>
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
References: <20230116203711.2214-1-maxim.cournoyer@HIDDEN>
Date: Tue, 17 Jan 2023 10:52:12 -0500
In-Reply-To: <20230116203711.2214-1-maxim.cournoyer@HIDDEN> (Maxim
 Cournoyer's message of "Mon, 16 Jan 2023 15:37:11 -0500")
Message-ID: <87zgah17mb.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

Hello,

Just a note to mention that this is currently based on #60849 (I've just
marked it as such in Debbugs by making it blocked by it), so if you want
to apply it, you'll want to apply #60849 first.

-- 
Thanks,
Maxim

Last modified: Tue, 17 Jan 2023 16:00:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.