From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cNttJMvVzGDrYgAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 19:20:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id GJ6iH8vVzGBJCwAAB5/wlQ (envelope-from ) for ; Fri, 18 Jun 2021 17:20:11 +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 299E113695 for ; Fri, 18 Jun 2021 19:20:11 +0200 (CEST) Received: from localhost ([::1]:49266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIA6-0007bO-21 for larch@yhetil.org; Fri, 18 Jun 2021 13:20:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luI9z-0007af-B6 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luI9z-00046l-3d for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luI9z-0004rS-04 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 04/37] net-base: Make #:builder argument a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20:02 +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.162403675518305 (code B ref 49025); Fri, 18 Jun 2021 17:20:02 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:15 +0000 Received: from localhost ([127.0.0.1]:57990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9D-0004l5-6l for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:15 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI96-0004j6-4C for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:09 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK7bD; Fri, 18 Jun 2021 19:19:07 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:15:58 +0200 Message-Id: <20210618171631.20534-4-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=1624036747; bh=OUVVb2aVinBOmXNC982I6Xbat+zZCYFQMkoE2v2einI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=mrZTbfRcxqhUkapMZRlpKGSttCVSycPy7KYH2Ah64lmeUit7N48xHkHMsKeA5NWCN kXhtFQu+dev6iu4JomJRQkqwQxVA/tZz69zHSDJopPfb5AXHIcl4dbRJP7hXnPCmzp DBf7wG+VbHOa54ZmiTAMlQN19B6suR2/mz+RDLNbf+wbwFGVfJLZJbm6YnT+IBkW/z ZQ78wpOeRJ6DU5eYWS/6cWBvMtFCmde0rbDynVacdqljGYaWZWGg+FRO1cI40xOyZC oDUsueUj7UpuYX70fl3aujNC4KjHmGgebSZ20YwdGhZOivq1JW3amnAAdPzawNjYUD LPKkJsaKI8k5Q== 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=1624036811; 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=OUVVb2aVinBOmXNC982I6Xbat+zZCYFQMkoE2v2einI=; b=I5ljt5ce/yE31ENV7tN81d8ZKiKOC4g6J6k8lK+HQW66jGVq9LCQv0M+nUyslB7s4hVsJQ BuIAe4HLoCAi4Ywp+FTWa0kklWCnHNLazFvXubM7vlgI2Rwn7haiBT6kkb4ULmeYYm53ZX YqtChIVN6s3kvEX8/nC8CGuIiMd00Z5PuY12BJbYARpZcb0bnKZSIOg4GxZ5b2p9W8xOpc PcNNwMgrkMUCCrGma0Gxncj7AfhU7tmCyXZxthB+XIKlijRZP2Jd/YzMYmBJ/9FwzuBJlK W1eC+2Um+RfXPudC5lYilcsLej8jvFHnsQyNO2KEgKN0bGitDZTqNFgx5Tk8Xw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624036811; a=rsa-sha256; cv=none; b=bKHjX0yynYsJL8gFFjY0gCJ5BHuj6kW0CTKPvBDtW2u7kn88f2W0twasr4K7nFb37yu0E3 jKPQwtSygKrW+4coV4Q4FQy3fz4vzwsbU6wJb56SFh4qT/er+XY/dERGt/T5BOfyaBbZ7q 4aukmYSuO/SCZZ3ya8f3zap5iDs7ylZgy4ighMOXhdIaoaLQRzIdoiowyAqWzDS/KigmI7 6y44OONPixCYKBZpr5IVqGFh9PcTD6WOiBAVW0TeHGJTnZYVuaUJFS1hg4VQWLJ+gbyD3a /xA/c3+W44gXe5pNRIh/EsiNFEzg2I5XuPcODE1TaveyzRoSSJ1Y2Gpy1/QcpA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=mrZTbfRc; 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: 5.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=mrZTbfRc; 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: 299E113695 X-Spam-Score: 5.17 X-Migadu-Scanner: scn1.migadu.com X-TUID: wFGmUeVjfISp This allows using ungexp-native and this-package-native-input later. * gnu/packages/admin.scm (net-base)[arguments]{#:builder}: Make this a G-expression. --- gnu/packages/admin.scm | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 531686fdbb..5c7e41f51b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -74,6 +74,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autogen) @@ -936,25 +937,25 @@ to allow automatic login and starting any app.") (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils) - (srfi srfi-26)) - - (let* ((source (assoc-ref %build-inputs "source")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (output (assoc-ref %outputs "out")) - (etc (string-append output "/etc"))) - (setenv "PATH" (string-append xz "/bin")) - (invoke (string-append tar "/bin/tar") "xvf" - source) - (chdir ,(string-append "netbase-" version)) - (mkdir-p etc) - (for-each copy-file - '("etc-services" "etc-protocols" "etc-rpc") - (map (cut string-append etc "/" <>) - '("services" "protocols" "rpc"))) - #t)))) + #:builder ,#~(begin + (use-modules (guix build utils) + (srfi srfi-26)) + + (let* ((source (assoc-ref %build-inputs "source")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (output (assoc-ref %outputs "out")) + (etc (string-append output "/etc"))) + (setenv "PATH" (string-append xz "/bin")) + (invoke (string-append tar "/bin/tar") "xvf" + source) + (chdir #$(string-append "netbase-" version)) + (mkdir-p etc) + (for-each copy-file + '("etc-services" "etc-protocols" "etc-rpc") + (map (cut string-append etc "/" <>) + '("services" "protocols" "rpc"))) + #t)))) (native-inputs `(("tar" ,tar) ("xz" ,xz))) (synopsis "IANA protocol, port, and RPC number assignments") -- 2.32.0