From unknown Fri Jun 13 11:02:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60868] [PATCH] build: pyproject-build-system: Use wrap-script instead of wrap-program. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 20:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60868 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60868@debbugs.gnu.org Cc: jgart , Lars-Dominik Braun , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16739014582889 (code B ref -1); Mon, 16 Jan 2023 20:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jan 2023 20:37:38 +0000 Received: from localhost ([127.0.0.1]:34944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHWEc-0000kX-2w for submit@debbugs.gnu.org; Mon, 16 Jan 2023 15:37:38 -0500 Received: from lists.gnu.org ([209.51.188.17]:35068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHWEY-0000kN-Tc for submit@debbugs.gnu.org; Mon, 16 Jan 2023 15:37:36 -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 1pHWEX-0007k1-5m for guix-patches@gnu.org; Mon, 16 Jan 2023 15:37:33 -0500 Received: from mail-qt1-x82f.google.com ([2607:f8b0:4864:20::82f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHWES-0004B3-9x for guix-patches@gnu.org; Mon, 16 Jan 2023 15:37:30 -0500 Received: by mail-qt1-x82f.google.com with SMTP id j9so2830021qtv.4 for ; Mon, 16 Jan 2023 12:37:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tN3kCXvG1iYzSRadl4JQRWi6/dAIl4QrxTwLxEUiL6o=; b=qeO7asI4TGY3HyowVYt30TvO8pv3cc4DbME1crQYrGezz+7M8YduhhZQQwnReBaOzP 1eDKyGZXFqBu04aLqKlA202Klgcv+xLVTCr+4IJI2t7u82t4t5S1FWFjKSC8m7cve0qC XKXcz/yYg/YA6McPlHpvlQ9LnSYRV5QlGA5XRx8hBE8oeZvwAhbe2JKSETnuqMKcXbFY K5aWty6I32oWTKOnw2XZqdvxRWvQd5s+Mfx5hkAYTx3RUzZBs31DEFFg3Vg8d/83dsLf XtVFYSFotetpALSxpN1Qr0AYRD6FyuNnXXJGBrMv4yVNrD1oidr4E1d0C83HYojNgxw/ sMQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tN3kCXvG1iYzSRadl4JQRWi6/dAIl4QrxTwLxEUiL6o=; b=CxlebQH8ICL8FWk4FYL9T3nAWeNowQF2Ml5zx7BN0wU7zOeHHGVbVtfRYi+uqMpvQq NOVy7+EpSR9fNXFnsLcsDcs5F1NVl9gFK21d+PF2rN84cbwnx2TclXOAgefLH3hUW751 Qy8vZtkdmZhyQ9Y3jBCWPYi302TFXtbzUo13JgjmO0kYJ0+n+ajIXH5IY/RRtlgy857h vsmviHJXSzFDkpRuMqr9r349bTQxHVfanRT0L4uLsuJ6yDnfX8t+nuXLOVgNsdo9rzax bQq1tPAi7GGigTQaKSOucwfZeDdVjpsDiojcMaoawhA51u7VIeXqqNb54NCuW9neb8gc nMtA== X-Gm-Message-State: AFqh2kqKXfX997exPsyjT4bidB6Ul6C98XgV7COZzrixykdLWHiC0p5y KR6Ja365zzC4I1Tt3xB8FnAPrvm5PoHQHJ5Y X-Google-Smtp-Source: AMrXdXtkH57DDGvbBziCyOMg0Nw49Qr43alg2H7VUO5PnD52aeq+3SJB3EqTKXxpxj4sWfXrNhtkjg== X-Received: by 2002:a05:622a:22a6:b0:3b6:2b4b:5688 with SMTP id ay38-20020a05622a22a600b003b62b4b5688mr616211qtb.11.1673901447142; Mon, 16 Jan 2023 12:37:27 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id fd7-20020a05622a4d0700b003a5fb681ae7sm15126262qtb.3.2023.01.16.12.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 12:37:26 -0800 (PST) From: Maxim Cournoyer Date: Mon, 16 Jan 2023 15:37:11 -0500 Message-Id: <20230116203711.2214-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::82f; envelope-from=maxim.cournoyer@gmail.com; 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@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: -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 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 17 10:50:13 2023 Received: (at control) by debbugs.gnu.org; 17 Jan 2023 15:50:13 +0000 Received: from localhost ([127.0.0.1]:38008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHoE0-0005zi-T0 for submit@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 ) id 1pHoDw-0005zD-Cg for control@debbugs.gnu.org; Tue, 17 Jan 2023 10:50:11 -0500 Received: by mail-qt1-f172.google.com with SMTP id x7so17370866qtv.13 for ; 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 (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@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #60868 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control 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 (-) block 60868 by 60849 quit From unknown Fri Jun 13 11:02:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60868] [PATCH] build: pyproject-build-system: Use wrap-script instead of wrap-program. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Jan 2023 15:53: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: 60868@debbugs.gnu.org Cc: Lars-Dominik Braun , jgart Received: via spool by 60868-submit@debbugs.gnu.org id=B60868.167397074123274 (code B ref 60868); Tue, 17 Jan 2023 15:53:02 +0000 Received: (at 60868) by debbugs.gnu.org; 17 Jan 2023 15:52:21 +0000 Received: from localhost ([127.0.0.1]:38013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHoG5-00063K-A5 for submit@debbugs.gnu.org; Tue, 17 Jan 2023 10:52:21 -0500 Received: from mail-qt1-f172.google.com ([209.85.160.172]:37668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHoG3-000634-CL for 60868@debbugs.gnu.org; Tue, 17 Jan 2023 10:52:19 -0500 Received: by mail-qt1-f172.google.com with SMTP id j9so4727863qtv.4 for <60868@debbugs.gnu.org>; Tue, 17 Jan 2023 07:52:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=vQph+U78wM7gswDtCtC5sFWvDDgodFlWzTXt5s4aRHM=; b=hYbiF03cug4KiCrOxdL28fblVGe3sQmTh/jb3DSXpGItKNuH/3OVPKnmp0Ec2SMQxq jIOEuDbptDuBMRMU/q1pIVv0jYGU7uedjAo5z4Uz71Ew0DQYbTfVlgitbnBCqPsVD0Ak cYm+hDTyXv8FbbmSc7DgRzyl4ugjOcDlqB36GVMzeXA2jttzNIUwtTRER0ZOSA12tXdF hZtZNrYzQ0FhOpS0T087HjwqChUxHvCZUmQTfYlmEN52oE1t/+N5V+FEhB9OMvau8RMG VrtB6qm5iSVGmUqyj76xc/6OaHjxaxHmFuswXOJtBlbYXb0uIngQmUucb+bwpGAZAgX8 7P5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=vQph+U78wM7gswDtCtC5sFWvDDgodFlWzTXt5s4aRHM=; b=AdUfj60a2cKUnTQUjumMH9HORhp/rMp/CFFNZY44vTKDON9hGvVGuMuaGCy703Vy3Z 0CuO5pbPDz7WF8UvwuGUiZVJGuzEgyFPEbsGLW0dv5sInlL9yp/7nVPS/FabtOckyCtY NB4APw531B9eV4g+1LDUELiARqlVq8e5w23X5jQ1wgl2fwXiXOdBlo4w3RV+qn/9hrZf sQuDZeOrLWVIrUZqFsmOQtst8eJeQbS65YBc59mr/F8tGpbOI5fJ1D9I+UgqKCTzmWSj uf9W8FuoVilbK/0bkcbZTA3YObfFuxqzzQYlX6c6Mc1PqGJhabKhwe/P9QmcYJunXm+P 7VaA== X-Gm-Message-State: AFqh2krcFjazxYpwttGfGLCAZhpuIgknemETIGbqEjyI+ye8/ZlVDpyt dimF3J7/FMouYzptPaZY45q8e7hnFPPpVUB4 X-Google-Smtp-Source: AMrXdXvNxAXjEcyPqxLd4oY+x0m1UyF/Gf9PrHfjrHYA1QiO7J45pyYrRkv6OPiY5zCw0VbJAVyJHQ== X-Received: by 2002:ac8:540a:0:b0:3b6:461e:afec with SMTP id b10-20020ac8540a000000b003b6461eafecmr308978qtq.31.1673970734112; Tue, 17 Jan 2023 07:52:14 -0800 (PST) Received: from hurd (dsl-205-233-125-107.b2b2c.ca. [205.233.125.107]) by smtp.gmail.com with ESMTPSA id t13-20020ac8760d000000b003b63187dbe1sm3027167qtq.27.2023.01.17.07.52.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 07:52:13 -0800 (PST) From: Maxim Cournoyer References: <20230116203711.2214-1-maxim.cournoyer@gmail.com> Date: Tue, 17 Jan 2023 10:52:12 -0500 In-Reply-To: <20230116203711.2214-1-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Mon, 16 Jan 2023 15:37:11 -0500") Message-ID: <87zgah17mb.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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 (-) 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 From unknown Fri Jun 13 11:02:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60868] [PATCH v2] build: pyproject-build-system: Use wrap-script instead of wrap-program. References: <20230116203711.2214-1-maxim.cournoyer@gmail.com> In-Reply-To: <20230116203711.2214-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Jan 2023 13:35:03 +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: 60868@debbugs.gnu.org Cc: jgart , ludo@gnu.org, Lars-Dominik Braun , Maxim Cournoyer Received: via spool by 60868-submit@debbugs.gnu.org id=B60868.16744808463348 (code B ref 60868); Mon, 23 Jan 2023 13:35:03 +0000 Received: (at 60868) by debbugs.gnu.org; 23 Jan 2023 13:34:06 +0000 Received: from localhost ([127.0.0.1]:53663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJwxZ-0000rw-Nm for submit@debbugs.gnu.org; Mon, 23 Jan 2023 08:34:06 -0500 Received: from mail-yw1-f170.google.com ([209.85.128.170]:38546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJwxX-0000qY-Np for 60868@debbugs.gnu.org; Mon, 23 Jan 2023 08:34:04 -0500 Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-4c131bede4bso171470867b3.5 for <60868@debbugs.gnu.org>; Mon, 23 Jan 2023 05:34:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Zx91risw8UhmZa0NajYNxBtmDuGdN/pGwRfBcMdAQXE=; b=Ek49SjvX/bV/IEgI+0vmuMPTOruyzrIdriDk6egT2IAoZqkeZyHlgwAkvqfKyTwRsy YglF50fj36ELqiQmMeVZhD4PET2RfCqnyC3di27MLMZNIAXIy8U7VgFFNx34wJICLIvQ ayWAAY7s6fZOLgeowOsYQbpC/L/xaT0Jv98krawaIaTAw21415aCJqDladKHq1QmeoFL 27iuI6NpEC8XOISE2lDICeexR15DSeiGRSX7z1RGXOhwBsLtExJTIOelB20eh8OKgLwL SCPIqsjJpj5yJu+QuENs/eEvII02ZLrgFSzazCe8NjXKUv1GsUyyJgPGvGNjvf6Rncmr V4/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Zx91risw8UhmZa0NajYNxBtmDuGdN/pGwRfBcMdAQXE=; b=mZklqjyj2UEjgmBMZLK2ngbnr25EqxaQJnCVb2vZulrTrOeHd7kjSGuWl/dNfgC53j 4PCZqKGfUFLh1GPOMMAMmEHUoeU8Fl6VlEcZ3nOTedTO8mGVXZ+hWPQmLv2JymBEvoln 162SseGS3sR+ulPWcxjbM3fjXziPXTzp65nfK+u5FG35rYX7gRw9dm9gqi3XJh6uRrep pHfTfOxkfL/EmMJpLzokZ0kCLI2fMZmCGyJGxFnGnLARp6IkAL2Vywg7jRpxkIudCNJY ExFajm5jrbszmYlIZyHBTHHYKg8FCCDCIYFdK+sJXxRNuvC/a5NA4BoiqQsb15t8DRyF GXOQ== X-Gm-Message-State: AFqh2ko5FMCQEy2ozcOrGlCoOGtaxXafaJASpSdAY30aWABOK2S5zClM y2zv7BL3sYx1wL/RZDWZ+NdSRhZMYw3dAgJ7 X-Google-Smtp-Source: AMrXdXs3qmJYBcvtfGJauyapzlw/d6Bn3+n4FPq4mOQEBc0R2c/0WoVYyXjkRwhrhexgjIuVm6M/WA== X-Received: by 2002:a81:4f82:0:b0:4e0:cd27:b6b6 with SMTP id d124-20020a814f82000000b004e0cd27b6b6mr12628434ywb.33.1674480837991; Mon, 23 Jan 2023 05:33:57 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id u24-20020a37ab18000000b006f9c2be0b4bsm15374927qke.135.2023.01.23.05.33.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 05:33:57 -0800 (PST) From: Maxim Cournoyer Date: Mon, 23 Jan 2023 08:33:54 -0500 Message-Id: <20230123133354.1345-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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 (-) * 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. --- Changes in v2: - Rebase 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: 67458b9793d69c7d10c7d885edd5d1ce5a2e9648 -- 2.39.1 From unknown Fri Jun 13 11:02:29 2025 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-Spam-Score: -2.3 (--) 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: -3.3 (---) 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.