From patchwork Fri Jun 18 16:09:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30403 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 2619227BC81; Fri, 18 Jun 2021 17:16:56 +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 DDB7027BC78 for ; Fri, 18 Jun 2021 17:16:55 +0100 (BST) Received: from localhost ([::1]:54698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luHAs-0003rs-V6 for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 12:16:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5D-000081-9D for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46283) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5C-00024W-QS for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5C-0002xZ-M5 for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 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 16:11: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.162403261810946 (code B ref 49025); Fri, 18 Jun 2021 16:11:02 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:18 +0000 Received: from localhost ([127.0.0.1]:57713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4T-0002qS-Vf for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:18 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4N-0002o5-Dl for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:11 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gAALo; Fri, 18 Jun 2021 18:10:11 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:03 +0200 Message-Id: <20210618160936.18972-4-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=1624032611; bh=OUVVb2aVinBOmXNC982I6Xbat+zZCYFQMkoE2v2einI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=c4NCQdp16Iv7koj3wYZWfq86k7imqQ8JScakkJ1gM5dHmvN15ZFCkcKIps6ZGtqYC pXZM1NgOA4pXA7cy9vvI1r/GPSy9bFn6e89FCQddPKaqHZeukNXFP4KBHl1mh9MSoZ LM6X+yJkiJZZrUyRDqCWXOByuV+z5BUAtjveWvCYdB4WInkjW8h1ocCp6WgTUtdQjG NcJ7OEFrvE7vuRcliCB6YWZ91K1sTKeXXXqndGNrhdaGNao9gQvX5NgBk1MYJOhRtu u68yb9XELlxwL1BEIzX+9nC5dN7JWSP//Z0zweYOWCL7l0m1Br/+VauNHCTg5KPY/G CmFlQpL+RIkiw== 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-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")