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 0K45H3fWzGBzYgAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 19:23:03 +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 4ID3GnfWzGDpBAAAbx9fmQ (envelope-from ) for ; Fri, 18 Jun 2021 17:23:03 +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 3D66A12185 for ; Fri, 18 Jun 2021 19:23:03 +0200 (CEST) Received: from localhost ([::1]:56660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICs-0004Xa-6i for larch@yhetil.org; Fri, 18 Jun 2021 13:23:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAG-0008E6-9J for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46578) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAF-0004Mr-W7 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAF-0004w3-TE for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 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 17:20:19 +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.162403680418714 (code B ref 49025); Fri, 18 Jun 2021 17:20:19 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:20:04 +0000 Received: from localhost ([127.0.0.1]:58090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9z-0004ra-H5 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:20:04 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI99-0004jB-7E for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:24 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKAc6; Fri, 18 Jun 2021 19:19:10 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:07 +0200 Message-Id: <20210618171631.20534-13-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-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=1624036750; bh=IRhMRYtA5bO8jImKpsV7nKzgOxcI4vux1/LJAwKO0vs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=DWdIvE158NHud+DNXSYJJfPeUrjNheTUZhxqMNGglWqn9yoYdrhZU+FytnzAm4xFh MjzZ6BQaokkemtwN5CVtUEVFPTjtBOnxz75lM041k/Oh6HRITOjVkMfBaC0arFmM9d WQXkas7yR6zbYIeWJ8UIE54c79UuUm/hGXR65o3KzUQhNFROACun42ds4DOJGWzVtM sEd9YIt4hJ/APmD/ybu9Jxx0BsJjsgIzhoTfa2kYKDJTch5RD/2FM5OJlHw6UEt4oO P0AohuQS4UU2Nz/P1CA2vb3wmMXKj/zLIN9Gj7DJxRqNKEh7BKtcKZlpsbKsXOZq6E q+QjkoVpwFbNA== 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+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=1624036983; h=from:from:sender:sender:reply-to: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=IRhMRYtA5bO8jImKpsV7nKzgOxcI4vux1/LJAwKO0vs=; b=KJ0fKPDPy0PasAncnRBc6t2OuOE0v/vMiq28KYPzUGh1ire6WHv9dEe3KgvwiEmlkc4FSo lZu5xT7u4NNpPz+GEI5kZwGYqQEOnXQszmBqwJpFcGXVXkSsGb7a/DvUv09XGO5k7B5YrM 7wBqmYH+6AP9+MbNFbHwvMttMuuWAlhELcZxn0snbkxXYbsd1yX7QGlZtlZTuWIjPdEj8d Pxzn9fXLPFg1EIKgrZMYG3kXNW1704fScK3/bF+6gWVbpuXkv57/HqRIRGGSuF4W3aRvBo hgBqhbYY1wkHRUwjgI4QXTD8hq9bgBC5h25Wpfh6kavWbmU6DlgDbd/BycEpSw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624036983; a=rsa-sha256; cv=none; b=S2Xo+J1tvEMEk0/LOw9MoBaHZtF0eXYLC7PiWci2dZiSxyORFOeZNLAztbzbcoKFJnzL2c IwiBJMYdVrlNJcsBpT+XaaQiQJ9C75LwITqKY52w+5NF/O0L8fEbz1kcKKysHDI/qiJuCF KwS8IDYFoGjt5UZfoQjD8Lnn63vhMuneTf+q+8ZyKER/LvNzF9uvbFEUo4BslKi3+ZDrQl pENnRkgg3eD6lvApVrpNpViudz9UtOI7oOiSx+I5j6FLJsFQzjugjHwk041WIy/hlIYCsS fz548Ayt9SW06+otl2s5u7Qr34BDdDXYiD+Meiv74G3b8ZChovkN/NM3b9W22Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=DWdIvE15; 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: 5.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=DWdIvE15; 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: 3D66A12185 X-Spam-Score: 5.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: dvNDiDXOkOjy 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 -- 2.32.0