From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cFMwIPnGzGDQPQAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 18:16:57 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id j7u2G/nGzGAgHgAA1q6Kng (envelope-from ) for ; Fri, 18 Jun 2021 16:16:57 +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 227D910EA3 for ; Fri, 18 Jun 2021 18:16:57 +0200 (CEST) Received: from localhost ([::1]:54698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luHAu-0003rs-1W for larch@yhetil.org; Fri, 18 Jun 2021 12:16:56 -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 Content-Transfer-Encoding: 8bit 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+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=1624033017; 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=Ymd1sV1aXIZ5Jn4ehoDlhn9CmyXgofoUReBJoXzURz9dlENxCo0zXIUOkf3HHZLYS/y39D YlumV39dpm2u1N01AbOS47KA6O9Hph6KTvDfOHJfNkQ/N+/Rrf7jEmcb0h/AQK21cWS53Y i3u4z3SR6R315Jlo+4gwCdOW/TSdeeXo0RgwSzbvWIf9/lKnfhrb6bS+M/bVeI/zSucjp7 26HXJmdPxNvUfgW1ANUPvL1Bk2VhpACja/OJEvCEuAW3bFm/rz+f5qm4zIRA7jb/HNTk1L 35xkPx17pO4RSl9kSeWfTBKOrbeRTMjV8LVf4lhj/kPxNaZUjW9GfFy6zAbZYA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624033017; a=rsa-sha256; cv=none; b=a8L3pBtPD61junOxEd2qMZ+Ggmd29jMO1o0YyiGu8aDVduQP6r/OQFPkfuQvESTBIBTbOV eiCLAv2Q84MyAidMno5nsHAJScBUnVVdexVTL9ZDnR5V4p0S8DM82dgEONl3AUE+r1iigu D5Noo5/y2Q8lCSBMGKqyEK/zRE6VzC0R3xATt/wRMoo+bi1fHgubak3g93nadoMU/AvYM1 7uTlAP8fnCXb/wfwe2L3oK4m2FPzpXUjZIdMdPU0fTj/5za8GpMjhJhgKYhkXSxHS72snx rbdRblxpyjAfHbWqkctPz2w6Dh2f45hGXU2r5mYneIHvuNxnH2S8loi0BLwoJQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=c4NCQdp1; 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=c4NCQdp1; 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: 227D910EA3 X-Spam-Score: 5.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: imlp49Xj+HWo 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