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 6CbMHzR7x2AmZgAAgWs5BA (envelope-from ) for ; Mon, 14 Jun 2021 17:52:20 +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 gBpeGzR7x2ChQwAA1q6Kng (envelope-from ) for ; Mon, 14 Jun 2021 15:52:20 +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 15B6F261B7 for ; Mon, 14 Jun 2021 17:52:20 +0200 (CEST) Received: from localhost ([::1]:42888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsost-0000sL-1w for larch@yhetil.org; Mon, 14 Jun 2021 11:52:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog2-0002vq-Sq for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36065) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog2-0007iu-Ip for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog2-0004Ii-Gs for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH 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: Mon, 14 Jun 2021 15:39: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 Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368510316393 (code B ref 49025); Mon, 14 Jun 2021 15:39:02 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:23 +0000 Received: from localhost ([127.0.0.1]:47575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofO-0004GF-QF for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:23 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofH-00049r-MG for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:16 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3eF250050mfAB4013eFYK; Mon, 14 Jun 2021 17:38:15 +0200 Message-ID: <1c6f166aa09333a575a5249fdb395cf1b59ad947.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:15 +0200 In-Reply-To: References: Content-Type: multipart/mixed; boundary="=-NWGIT1MGPe7D4qTZCzlE" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685095; bh=F0LQlc52A3WRTY1kOYijXentyYV4rzyXJT81/RjV9wU=; h=Subject:From:To:Date:In-Reply-To:References; b=nfeFq8/nU01K99gdGFZKmFaHIfxQTU7E6T4z4Gmm99o8K0K8pAF4izb5zf+a1SuJH QuQIWnefCoRYKMC3jWfJjW1+tbyf2TCtLTCImMmH3CAdU5nAQTwbfsH7aNCZv2kgRy iseAlSH6nZllQgwaWDqfYmXzNATR53L86g3uYTD96DsQ6f3sbUKEACFTbDOzXQt1PQ eBltrYL00WqIxuHnQ1nAn2shkWoFNCmWjAM1AcuWz0JxifPyv0bEsRe3M2PxJCw3ep Fl5N/LXe/yx9AZ0xs1IoIOetx7SS7zwhK85zzdAqQfjjTx7ge15wRzJ+4ptW2D24mW NRKT2JV5+g7lA== 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=1623685940; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: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=F0LQlc52A3WRTY1kOYijXentyYV4rzyXJT81/RjV9wU=; b=glDOIt2IwQAKdz57RwsjdAIBb/t8x61DuckmL6P922bDHp49m5J5gKZzi+5sseVPlcSdSX eMgLoTV7Mm2K5FQHYT/CoePl1lF6i/tmOaQCnd3jngg9c/opogAGWgd9ct9a4ZuIBnYiOQ zAFqu+oQUTkPtSPax1eRhOPBAnFg2l2fqMqiDR6rT6SPXuHABwLgh3kHCj8IyqgeDxd1dD tLiHMarHXNVeA0EZzCo14UYARND4lXgV2VuDw31rlZyUZ8T8lGsRYHzSwWBCusPZcDMBZY JqpBeueoLKtjaf9vtT8wfiN3fAb8iZxE7gfOV3Aexj8fLhcYK3W+BIHfhhbH5A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623685940; a=rsa-sha256; cv=none; b=R+fe5xMxR4ID9PLsLLkYzst7njt9Yxyf2nGDQU0yfXgAQdT0eZTKnb+V1SZnIbOiXeh5F2 m/6ZbdLclxwzzf8bOIWwi2UYx00v/L0wSkKUytX0phuSCbKS9qWiOE+t2n7ioxLWzG1GLu vYkNRbJ9yAFpyKUKojLYowEFjWJT8lKDC6fba222nHgVdMj27+WtQoNjMtou+Qhl8NrY5s xzYa5FnMOdVMZvj6h/Fn2PnlHUHb8X0Mv9TIF7gPFGBKjukj90EIhhuxHsF4VK9znNd2g8 6hOhcKukg2TxgK4X5ItOFo63PecplZov61oT+XREVUMlTNg/3rduw4FNB7EBpA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="nfeFq8/n"; 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: -1.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="nfeFq8/n"; 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: 15B6F261B7 X-Spam-Score: -1.33 X-Migadu-Scanner: scn1.migadu.com X-TUID: uzVCCzBQnmL0 --=-NWGIT1MGPe7D4qTZCzlE Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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(-) --=-NWGIT1MGPe7D4qTZCzlE Content-Disposition: attachment; filename="0004-net-base-Make-builder-argument-a-G-expression.patch" Content-Transfer-Encoding: 7bit Content-Type: text/x-patch; name="0004-net-base-Make-builder-argument-a-G-expression.patch"; charset="us-ascii" 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") --=-NWGIT1MGPe7D4qTZCzlE--