From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id IFk8DhMIzmBkEAEAgWs5BA (envelope-from ) for ; Sat, 19 Jun 2021 17:06:59 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id OHnRCRMIzmAOEgAAbx9fmQ (envelope-from ) for ; Sat, 19 Jun 2021 15:06:59 +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 A49C52C553 for ; Sat, 19 Jun 2021 17:06:58 +0200 (CEST) Received: from localhost ([::1]:51158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucYj-00006b-ND for larch@yhetil.org; Sat, 19 Jun 2021 11:06:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXt-0007ke-AC for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXt-0007qy-3B for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXs-0005e3-UF for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 04/36] net-base: Make #:builder argument a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:04 +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.162411512221405 (code B ref 49025); Sat, 19 Jun 2021 15:06:04 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:22 +0000 Received: from localhost ([127.0.0.1]:60354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXB-0005Z4-RI for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:22 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucWz-0005VF-He for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:10 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB401359oB; Sat, 19 Jun 2021 17:05:09 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:26 +0200 Message-Id: <20210619150458.12057-5-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-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=1624115109; bh=ctZm9OVHom3MpxyL0gcsO+Tj7VTiM45ESGzTs/AaDrY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dqsj6kJ15LuThYohvGrPTjunFNYTew6lLkk/Peq89vThC+n/vfcGrHlg5zkoEiF7k 3abFM69UUfLeBLIuxqo2MS3tcpcQ8znLeKFtM5n5VB0Bk/DXHTX69C9F8/fsEoxKQO CiphZBEzdluZx25+KJiglaxBd987grUscr/rbaeKISOVtzgrvyioEj9i9Ex8OVnYCi LL8LqTdlp/9Eb8heJbgZvvmQxkRhA2O59LdYCOvFP8pa7XkflEp/TVxdUdsvh/5Uju Kq23r+B4r+SQDmzRgzJp3Ea4cdBVOTx2z/0E9bVhkbiO7quqgvYe9OJLqDbckeCKQe gXY6YSaRhiJTw== 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=1624115218; h=from:from:sender:sender: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=ctZm9OVHom3MpxyL0gcsO+Tj7VTiM45ESGzTs/AaDrY=; b=bKF6Ep4FLzfZuN3PaFtYoD4WDBIsUoqksbDDJvLfMK7wznRIWUfMJSkF0fB1/jnw63iAGm om/3qV+Y3DdIuFt3l0mR4mW1Ou7vAY6jDwKLDYzG7YYn7ALSoi5Ov0KLlq+PSOAQV13fBc LbBfIMRzZxMEpq8eQAV6mJ9dEJkT20TUYuIDyHDfrQepMvjEfUYwJqCfC3ouwHzqWwA1+S DijthYByQxs8fQ79ekaHTO1lcXaVXTUBAU3+E2/nQOA4uz17fJx+nkP1PmSH0SFKGiAH52 lA/rsXcC0YfS/OoUAAOqyeKbZh4pH1MhNQK0rRCTOgjkYZ14dgWBrpJEmR9p1g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624115218; a=rsa-sha256; cv=none; b=M16C2kLX/7OAkYdNzixky1P+OWzlcdGRCGeoRcqtd985bpziD8BmlXUOV62DHoNk5o03TA wpade+pn3H93WopZGuM1Kghg4HFG+MA9DxeNMT44+jb91V9ikx2UKJIKoU/trbNsMPHgtn YVQfm8aCsi2OXlg69hULYw94P/5v5O0gCvCIKQEfpmyJbqCZY8/GQhO9bUp6iySgejEGcr HvwnZEVXlfJl+TXw7MFDzLfW+0cqSEf6bsXA9Yvnwl79cSGYm2NIfvpaYOM5MS5HSs2paN HniAJ0R8omdOucCDce5CbR/n8d1b0J3w9grXQE5arQl4ZslCXk3b1x7x9ZzIcw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=dqsj6kJ1; 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: 3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=dqsj6kJ1; 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: A49C52C553 X-Spam-Score: 3.68 X-Migadu-Scanner: scn1.migadu.com X-TUID: YeuROtXOToIu 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 48b9c8b893..230ba98b41 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