From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KLDXNml9x2AmbQAAgWs5BA (envelope-from ) for ; Mon, 14 Jun 2021 18:01:45 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +M0bMml9x2CAHAAAbx9fmQ (envelope-from ) for ; Mon, 14 Jun 2021 16:01:45 +0000 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 6D1AA34D69 for ; Mon, 14 Jun 2021 18:01:45 +0200 (CEST) Received: from localhost ([::1]:40138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp20-00026C-F2 for larch@yhetil.org; Mon, 14 Jun 2021 12:01:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof5-0008My-S0 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36001) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof5-00077z-Im for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof5-0004Dx-HE for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH 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: Mon, 14 Jun 2021 15:38:03 +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 Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368504816070 (code B ref 49025); Mon, 14 Jun 2021 15:38:03 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:28 +0000 Received: from localhost ([127.0.0.1]:47511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoeV-0004B8-Th for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:28 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoeU-00049r-9V for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:26 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3dR2500S0mfAB4013dRPV; Mon, 14 Jun 2021 17:37:25 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:25 +0200 In-Reply-To: References: Content-Type: multipart/mixed; boundary="=-LMINSdcJEwFJd3XxnDEc" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685046; bh=1qeLHwmVYIRx4Ue2kBqdwmyXBFtamfF8FXSEaCaqb2w=; h=Subject:From:To:Date:In-Reply-To:References; b=qhTcRSpGiVMJEzEBmTLqH7oG9Lprx+toSPJrAUWcTNoz4pwlGUupEpsYa1e8GzUQd NUHCtaSNzDZWZp5GWh2Ik2Mmbe5hxVchp4tPdsVFgLZFzA/tCo+EzVvpB2nztWLKSt /n+v+6s5x/XOtVySbgr2Pzsh4QGO/l1u1PBuMgjCcqNVNuFThMe82OF6K43DdIugBb eYiDmOoTMHKFROMjvoGQS6mBSy2FYHZHX3+wScgdfcGYs+u4YZUc5VhgGLzJyzrddh hJGWFhoG4f5X34G5NIJSXZwvXCWzcJ1TrQMZq1HHi5im9KzPLbeTVmOOYTi6fA+aKB VpRA+/3clVJDQ== 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1623686505; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: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=1qeLHwmVYIRx4Ue2kBqdwmyXBFtamfF8FXSEaCaqb2w=; b=Ae3LHQupH+ym1qQm8qr45LBGPOZUOyHvDqoJ8newoP7cwV/BS6XT0T56lBn+DXdKZy3apW +VXFzUbAIkdGTsmD0Em6Qox6pYuQfnbq6dIeaWTFuKaVtwR7Msf7hY+YwMWihzg8XGE0Ec UxoxYG192GQOafIjCAKaYDN2KWOuHjG/ZltQEYacGfjoU3JPgODpo/AHNyrdBy8OpO8ymz IWN8GpQXMQKZB7tXnbtcxAj3tgI58eIZ0qMuIQr7tUVOi3sJkC65SwP+9cE0F4xma4RRmp YOdZ2p5Ns2fehQrhddWOKyz0dNmgbvZrvKBOJEAlWE23uHi5ZbbEWKtM/zAiog== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623686505; a=rsa-sha256; cv=none; b=SlyeTfZmDgeZmrT898PqR0NvvfzrKg+mdK5CPM3uY3T88dozJjAAnLWmmcYddJgRqB0bhC pAe33/J5ECyQNQLuMbquTn0sE/I25VLWSpdStknhLTl1bXM9MpmTGQh07Rs6cLEJJz/bln D+St1etETcZVEwaxYk4eRJT535ibflRgY6cPMMRetXP8XXgtoIsIooF3dfWLG577Aagav5 Uuud/vzJXlo6IbCICdN1VyGS4YgWRluYgNNwJyXutwcpkM/iuZmXYe7wyfWBHLiBPGeNmr 2NSabSw9QnQugk6heGfXin/CmN2tZeZBJltL6ChSPH/tPvvPQUJqyiA82w4aog== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=qhTcRSpG; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=qhTcRSpG; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 6D1AA34D69 X-Spam-Score: -1.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: B48eg7HH9CyH --=-LMINSdcJEwFJd3XxnDEc Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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(-) --=-LMINSdcJEwFJd3XxnDEc Content-Disposition: attachment; filename="0013-wrap-python3-Make-builder-a-G-exp-instead-of-a-raw-S.patch" Content-Transfer-Encoding: 7bit Content-Type: text/x-patch; name="0013-wrap-python3-Make-builder-a-G-exp-instead-of-a-raw-S.patch"; charset="us-ascii" 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 --=-LMINSdcJEwFJd3XxnDEc--