From patchwork Fri Jun 18 16:09:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30406 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 27E1D27BC81; Fri, 18 Jun 2021 17:17:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DA25927BC78 for ; Fri, 18 Jun 2021 17:17:28 +0100 (BST) Received: from localhost ([::1]:55802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luHBP-0004dl-Uq for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 12:17:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5G-0000J4-Ec for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46291) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5G-000275-3l for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5F-0002yW-VC for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 core-updates] 13/37] wrap-python3: Make #:builder a G-exp instead of a raw S-exp. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 16:11:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162403264211175 (code B ref 49025); Fri, 18 Jun 2021 16:11:05 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:42 +0000 Received: from localhost ([127.0.0.1]:57781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4s-0002u5-3i for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:42 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4U-0002qa-Qc for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:19 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gAHN6; Fri, 18 Jun 2021 18:10:18 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:12 +0200 Message-Id: <20210618160936.18972-13-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618160936.18972-1-maximedevos@telenet.be> References: <20210618160936.18972-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624032618; bh=IRhMRYtA5bO8jImKpsV7nKzgOxcI4vux1/LJAwKO0vs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=jB/LdXK+elJ1M9Nx6Er5Q1gXdDMYeq4l1LNEMtlkuLJVr68gfsLI//rgNFFS03yhs tUbMMrx/QkSV1tgRiP7qvtJKBv3Gr4AtCHO3DZNSPgoKslcdVd3umSs/YLj7pm6PD5 cihpDvhnbCUgH48jCpM/oJsmxW85WXkwqVhzDkKyPvjGqP5HG3PQqdb1HNRS5+aR2D PVpntGRMgI3PaT0EgJmIjpImdHU9O+Zo2zKqcGgdqG9YtxMbo8tCZ7OJ4w8xXETmG+ 1bp8ZJFczylXgCnGFTMDmS6062P1I2myLi6+Q69b+4ZcmsUx70zct4EUXkPFtXz7dB 2y2kFiLQgXpkw== 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: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows using ungexp later. * gnu/packages/python.scm (wrap-python3)<#:builder>: Make this a G-expression. --- gnu/packages/python.scm | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b2ec486d7a..9628836567 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -573,29 +573,29 @@ for more information."))) (arguments `(#:modules ((guix build utils)) #:builder - (begin - (use-modules (guix build utils)) - (let ((bin (string-append (assoc-ref %outputs "out") "/bin")) - (python (string-append (assoc-ref %build-inputs "python") "/bin/"))) - (mkdir-p bin) - (for-each - (lambda (old new) - (symlink (string-append python old) - (string-append bin "/" new))) - `("python3" ,"pydoc3" ,"idle3" ,"pip3") - `("python" ,"pydoc" ,"idle" ,"pip")) - ;; python-config outputs search paths based upon its location, - ;; use a bash wrapper to avoid changing its outputs. - (let ((bash (string-append (assoc-ref %build-inputs "bash") - "/bin/bash")) - (old (string-append python "python3-config")) - (new (string-append bin "/python-config"))) - (with-output-to-file new - (lambda () - (format #t "#!~a~%" bash) - (format #t "exec \"~a\" \"$@\"~%" old) - (chmod new #o755) - #t))))))) + ,#~(begin + (use-modules (guix build utils)) + (let ((bin (string-append (assoc-ref %outputs "out") "/bin")) + (python (string-append (assoc-ref %build-inputs "python") "/bin/"))) + (mkdir-p bin) + (for-each + (lambda (old new) + (symlink (string-append python old) + (string-append bin "/" new))) + `("python3" ,"pydoc3" ,"idle3" ,"pip3") + `("python" ,"pydoc" ,"idle" ,"pip")) + ;; python-config outputs search paths based upon its location, + ;; use a bash wrapper to avoid changing its outputs. + (let ((bash (string-append (assoc-ref %build-inputs "bash") + "/bin/bash")) + (old (string-append python "python3-config")) + (new (string-append bin "/python-config"))) + (with-output-to-file new + (lambda () + (format #t "#!~a~%" bash) + (format #t "exec \"~a\" \"$@\"~%" old) + (chmod new #o755) + #t))))))) (synopsis "Wrapper for the Python 3 commands") (description "This package provides wrappers for the commands of Python@tie{}3.x such