From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cLHkMFcIzmD8DAEAgWs5BA (envelope-from ) for ; Sat, 19 Jun 2021 17:08:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id iBKELFcIzmAOEgAAbx9fmQ (envelope-from ) for ; Sat, 19 Jun 2021 15:08:07 +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 75AA8205EF for ; Sat, 19 Jun 2021 17:08:07 +0200 (CEST) Received: from localhost ([::1]:54560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucZq-0002Tw-FX for larch@yhetil.org; Sat, 19 Jun 2021 11:08:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXw-0007ua-R6 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48879) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXw-0007uL-J0 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXw-0005f8-Ej for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 13/36] 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: Sat, 19 Jun 2021 15:06:08 +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.162411512521467 (code B ref 49025); Sat, 19 Jun 2021 15:06:08 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:25 +0000 Received: from localhost ([127.0.0.1]:60370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXE-0005a6-Pj for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:25 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX3-0005VF-Py for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:14 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135DpL; Sat, 19 Jun 2021 17:05:13 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:35 +0200 Message-Id: <20210619150458.12057-14-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115113; bh=baX07FzdaFst7CwU1puNWTYenQjGwgUH3elU6tLjlKM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=b23xAspIwItyiYTKDW8mTglSBaYAmPVHyQ3UfDPm4Gqg7wMn4d3JcgmkY6AQUX18q UIcAXMtXTuJJ4qsQkrKJeRb3BisGYi72ME1pc9GdgOyYjGvNWI0Gqv8huFKFO+Z0YB HAPz2t6/F8A4R8/rzuXtNMV5+lCgAAlbQKcqPRPeswKvnezmEK/oUqf01Otb7eqhH6 Ijyi/19p7/bXI2Mq++Yk102KZvnQAFm/HGNu3Bg0z2OZXwxe4Wwy2jlR6OMb1/4w9Y TkSsdOnKZPkBUMm5BxeoHrKTwMHLaUiafoHoJbMbD+IxS9Li3dFwQka38in8GZ6AiA zRPROeCUs0RCA== 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=1624115287; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=baX07FzdaFst7CwU1puNWTYenQjGwgUH3elU6tLjlKM=; b=XpfkPq5MGwN8v1Cf+oG+k7Q/UHVwskRi59dkCMgofah77dHGV9FZHaW0cQ2JoXirVB82Nv kAQL2j1eB/vU8HRd40kPOESukAzZ4kdtsAw4irRTPSwPcEPnfR9RutC3slJwY8VLYyJVfS XosX7y+NkdHTJCR0RMrbpO6hPBCn0SR5z+9EiErJaG+OYC8Qhe1+//N2fnJFF3CHEna2KI N1bAZbqv7SbuhtILM24jdfjwgVAQ9pSRHYMuywqo769t6jaEkZ7MkuDt9vDTl+giGeUDtQ HFPPPjjyl10wE96o+/oaHEVjeyNRCfNJzGi2z0GyljKi8N9V2Y77Yl7EASD/HA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624115287; a=rsa-sha256; cv=none; b=Dt4JqFeuhwgRF+Y9JLyVDxSoku9T+gzjOQfVoz6m2uOkssdbdA8e1+fqfkv9bdKPlqvUuP ECrzkcdhMp4SnLnGlxSSsm1EWfUfVX9YrMHlwSRPztjalZNYYH4ylurLltd+AilvI9x8yg 1aVRDmRNtiADwOrcQbuR2Q670sm3oohX8RIk7lqFuM5DSB/YRlqu4Tw44zXz5fh91AqQnk QIHSDrkprjNi2dZTrVht5JBs4GSO5OyEC++YS9zhREfBBC7q/kAvrUl+PimeTRE9xIBh+C CDI/T7TxxJ8znhgUJiMt3DvoheUpnUHu1ssBgEFwJSYToYz6jZwMhB8FtkdX7Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=b23xAspI; 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-Spam-Score: 3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=b23xAspI; 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: 75AA8205EF X-Spam-Score: 3.68 X-Migadu-Scanner: scn0.migadu.com X-TUID: ajZPOVTeMpQK 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 227c612a68..fe8b93b1ba 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -636,29 +636,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" ,"pip3") - `("python" ,"pydoc" ,"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 -- 2.32.0