From patchwork Mon Jul 29 22:38:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jakob L. Kreuze" X-Patchwork-Id: 14789 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 1B0931728C; Mon, 29 Jul 2019 23:42:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D622D1728A for ; Mon, 29 Jul 2019 23:42:10 +0100 (BST) Received: from localhost ([::1]:56836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsELK-0005Dc-Ig for patchwork@mira.cbaines.net; Mon, 29 Jul 2019 18:42:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42687) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsELG-0005DV-8c for guix-patches@gnu.org; Mon, 29 Jul 2019 18:42:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsELF-00073B-8W for guix-patches@gnu.org; Mon, 29 Jul 2019 18:42:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40464) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hsELF-000731-5x for guix-patches@gnu.org; Mon, 29 Jul 2019 18:42:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hsELC-0000KX-Ju for guix-patches@gnu.org; Mon, 29 Jul 2019 18:42:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36847] [PATCH] machine: Rename 'system' field. Resent-From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Jul 2019 22:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36847 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36847@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15644400911226 (code B ref -1); Mon, 29 Jul 2019 22:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Jul 2019 22:41:31 +0000 Received: from localhost ([127.0.0.1]:49285 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hsEKh-0000Jh-3N for submit@debbugs.gnu.org; Mon, 29 Jul 2019 18:41:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:46777) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hsEKf-0000Ja-0o for submit@debbugs.gnu.org; Mon, 29 Jul 2019 18:41:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42633) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsEKe-00059Y-0e for guix-patches@gnu.org; Mon, 29 Jul 2019 18:41:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsEKd-0006tF-1L for guix-patches@gnu.org; Mon, 29 Jul 2019 18:41:27 -0400 Received: from mx.sdf.org ([205.166.94.20]:51129) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hsEKc-0006t7-Oa for guix-patches@gnu.org; Mon, 29 Jul 2019 18:41:26 -0400 Received: from Epsilon (pool-173-76-53-40.bstnma.fios.verizon.net [173.76.53.40]) (authenticated (0 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id x6TMfOw8005986 (using TLSv1.2 with cipher AES256-GCM-SHA384 (256 bits) verified NO) for ; Mon, 29 Jul 2019 22:41:25 GMT From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) Date: Mon, 29 Jul 2019 18:38:35 -0400 Message-ID: <87h874ihzo.fsf@sdf.lonestar.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/machine.scm (machine-system): Delete variable. (machine-operating-system): New variable. * doc/guix.texi (Invoking guix deploy): Use the 'machine-operating-system' accessor rather than 'machine-system'. --- doc/guix.texi | 4 ++-- gnu/machine.scm | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ccc36a8a97..cb3778af51 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25507,7 +25507,7 @@ evaluates to. As an example, @var{file} might contain a definition like this: %base-services)))) (list (machine - (system %system) + (operating-system %system) (environment managed-host-environment-type) (configuration (machine-ssh-configuration (host-name "localhost") @@ -25532,7 +25532,7 @@ This is the data type representing a single machine in a heterogeneous Guix deployment. @table @asis -@item @code{system} +@item @code{operating-system} The object of the operating system configuration to deploy. @item @code{environment} diff --git a/gnu/machine.scm b/gnu/machine.scm index 0b79402b0a..30ae97f6ec 100644 --- a/gnu/machine.scm +++ b/gnu/machine.scm @@ -34,7 +34,7 @@ machine? this-machine - machine-system + machine-operating-system machine-environment machine-configuration machine-display-name @@ -85,14 +85,14 @@ make-machine machine? this-machine - (system machine-system) ; - (environment machine-environment) ; symbol - (configuration machine-configuration ; configuration object - (default #f))) ; specific to environment + (operating-system machine-operating-system) ; + (environment machine-environment) ; symbol + (configuration machine-configuration ; configuration object + (default #f))) ; specific to environment (define (machine-display-name machine) "Return the host-name identifying MACHINE." - (operating-system-host-name (machine-system machine))) + (operating-system-host-name (machine-operating-system machine))) (define (machine-remote-eval machine exp) "Evaluate EXP, a gexp, on MACHINE. Ensure that all the elements EXP refers to