From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 29 18:41:31 2019 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.2 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) To: guix-patches@gnu.org Subject: [PATCH] machine: Rename 'system' field. 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 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 205.166.94.20 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * 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'. =2D-- 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 =2D-- a/doc/guix.texi +++ b/doc/guix.texi @@ -25507,7 +25507,7 @@ evaluates to. As an example, @var{file} might cont= ain a definition like this: %base-services)))) =20 (list (machine =2D (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. =20 @table @asis =2D@item @code{system} +@item @code{operating-system} The object of the operating system configuration to deploy. =20 @item @code{environment} diff --git a/gnu/machine.scm b/gnu/machine.scm index 0b79402b0a..30ae97f6ec 100644 =2D-- a/gnu/machine.scm +++ b/gnu/machine.scm @@ -34,7 +34,7 @@ machine? this-machine =20 =2D machine-system + machine-operating-system machine-environment machine-configuration machine-display-name @@ -85,14 +85,14 @@ make-machine machine? this-machine =2D (system machine-system) ; =2D (environment machine-environment) ; symbol =2D (configuration machine-configuration ; configuration object =2D (default #f))) ; specific to environment + (operating-system machine-operating-system) ; + (environment machine-environment) ; symbol + (configuration machine-configuration ; configuration object + (default #f))) ; specific to environment =20 (define (machine-display-name machine) "Return the host-name identifying MACHINE." =2D (operating-system-host-name (machine-system machine))) + (operating-system-host-name (machine-operating-system machine))) =20 (define (machine-remote-eval machine exp) "Evaluate EXP, a gexp, on MACHINE. Ensure that all the elements EXP refe= rs to =2D-=20 2.22.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEa1VJLOiXAjQ2BGSm9Qb9Fp2P2VoFAl0/dWsACgkQ9Qb9Fp2P 2VqnyhAApkapBUt5pUZ2sB5nxaZbb6pFxe00Do+upFmLYNZFRgSFpZxKXJALYadV jh0CT0jXxOqWxvH5+26LqJzmSSt0YohGab875zvzBHdupgOu/MPGOCYltrBvrzOk Pr/nxNAt+OckhFKKrCaKV85hONC0YiGPyBGuE0PVuib28SAXy8C73rwSlC47M4mZ sX1/Pl6X6K50sHXgFluWwzC8tU8S1dTMBHARjHsNPbCN5qYFORKsysn970WqOhM2 fQKiydhRtuA8chJAdN4ecaTHCV20g0Gjm5NdDT4mFj37WFuM/SfGs5Zu7KazNr2o qv8+yGohBvzpgzu50mzy/42UX1X+Ytz+ELFPsTwamU9JUdFO8CQV1+oeqtJ6OZrE rMP29y3jKQBC7O5SrPsP4sYY+jyYwo9+A8wb4rMZHtAFKKoLL61d0aRwV4edSinD +tbt6Za14q/IdIuhXiyY2HWsproDDaDHkgCjQ1sp7flBNqP/QI6UgZnCnAPXE2sp Yj4Vwio9Tc8hMI69Aauvdu8WiP/DyljTSAv/6FFIBX8YwTWPY3Z6hGKLUybQ9ckU nkhb/NTW50g0CKkXr75TuVyt/x3aUv1vEhPGVURly+1QmUSzGDQVyMdSmCj2Ie0E aoCHc6srNSD4kIjcqq9A7tcr5gTlME8clzIgKBMhk700fFr4tOY= =B51g -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 30 13:51:32 2019 Received: (at submit) by debbugs.gnu.org; 30 Jul 2019 17:51:32 +0000 Received: from localhost ([127.0.0.1]:51130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hsWHc-0006L1-Dy for submit@debbugs.gnu.org; Tue, 30 Jul 2019 13:51:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:48721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hsWHZ-0006Ks-7z for submit@debbugs.gnu.org; Tue, 30 Jul 2019 13:51:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38788) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsWHY-0006PB-26 for guix-patches@gnu.org; Tue, 30 Jul 2019 13:51:29 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsWHW-0007rc-Le for guix-patches@gnu.org; Tue, 30 Jul 2019 13:51:28 -0400 Received: from ol.sdf.org ([205.166.94.20]:55778 helo=mx.sdf.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hsWHW-0007qf-Dk for guix-patches@gnu.org; Tue, 30 Jul 2019 13:51: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 x6UHpNAp016275 (using TLSv1.2 with cipher AES256-GCM-SHA384 (256 bits) verified NO) for ; Tue, 30 Jul 2019 17:51:24 GMT From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) To: guix-patches@gnu.org Subject: [PATCH v2] machine: Rename 'system' field. References: <87h874ihzo.fsf@sdf.lonestar.org> Date: Tue, 30 Jul 2019 13:48:32 -0400 In-Reply-To: <87h874ihzo.fsf@sdf.lonestar.org> (Jakob L. Kreuze's message of "Mon, 29 Jul 2019 18:38:35 -0400") Message-ID: <87r267v2fj.fsf@sdf.lonestar.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 205.166.94.20 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * gnu/machine.scm (machine-system): Delete variable. (machine-operating-system): New variable. All callers changed. * doc/guix.texi (Invoking guix deploy): Use the 'machine-operating-system' accessor rather than 'machine-system'. =2D-- doc/guix.texi | 4 ++-- gnu/machine.scm | 12 ++++++------ gnu/machine/ssh.scm | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ccc36a8a97..cb3778af51 100644 =2D-- a/doc/guix.texi +++ b/doc/guix.texi @@ -25507,7 +25507,7 @@ evaluates to. As an example, @var{file} might cont= ain a definition like this: %base-services)))) =20 (list (machine =2D (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. =20 @table @asis =2D@item @code{system} +@item @code{operating-system} The object of the operating system configuration to deploy. =20 @item @code{environment} diff --git a/gnu/machine.scm b/gnu/machine.scm index 0b79402b0a..30ae97f6ec 100644 =2D-- a/gnu/machine.scm +++ b/gnu/machine.scm @@ -34,7 +34,7 @@ machine? this-machine =20 =2D machine-system + machine-operating-system machine-environment machine-configuration machine-display-name @@ -85,14 +85,14 @@ make-machine machine? this-machine =2D (system machine-system) ; =2D (environment machine-environment) ; symbol =2D (configuration machine-configuration ; configuration object =2D (default #f))) ; specific to environment + (operating-system machine-operating-system) ; + (environment machine-environment) ; symbol + (configuration machine-configuration ; configuration object + (default #f))) ; specific to environment =20 (define (machine-display-name machine) "Return the host-name identifying MACHINE." =2D (operating-system-host-name (machine-system machine))) + (operating-system-host-name (machine-operating-system machine))) =20 (define (machine-remote-eval machine exp) "Evaluate EXP, a gexp, on MACHINE. Ensure that all the elements EXP refe= rs to diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 552eafa9de..d1c90b6313 100644 =2D-- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -166,7 +166,7 @@ of MACHINE's system profile, ordered from most recent t= o oldest." environment type of 'managed-host." (maybe-raise-unsupported-configuration-error machine) (mlet %store-monad ((boot-parameters (machine-boot-parameters machine))) =2D (let* ((os (machine-system machine)) + (let* ((os (machine-operating-system machine)) (eval (cut machine-remote-eval machine <>)) (menu-entries (map boot-parameters->menu-entry boot-parameters)) (bootloader-configuration (operating-system-bootloader os)) =2D-=20 2.22.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEa1VJLOiXAjQ2BGSm9Qb9Fp2P2VoFAl1AgvAACgkQ9Qb9Fp2P 2VrlmxAAqrAXp2RNpF9dtPzWrr70uXYTAZq4f66rxHpm44wt96TurSBaywXtv2aJ Ru9ZP7glGoi+qlv9vb1u3CWCRWaeXFORnKoynGjiZ2LHU8Q+hhcotxbN9Ob6MsmG JKln2s+SlHohzlxQUhwa5CS5nvoGExq9e0lXAtNr5JoXZ75BKHhCY3hFhozulJdl XoriA7pndU77OVRE5Duund46uv6KljqjoKE9qhGnC1W14eDrN2j2fGnm+G034zI5 +rinLgqN8AnLG9n0Qn7bQkg7z6TPlkWNN0sKcTOJ9thmVioURbnUbU1bByXgPk9c 1LqRQljwviJoSlWv5kavzyOPrR5R6m3LsqGiK9xQmPTpoD6mGHm5+8UP8I2dJc30 GeTZAHUUG/L4nrjovAXjfumhOf06GC4Iez+brlVcmciGPbGt333Sy2lXrVyfLD7I dipEJQ+6VmlM6Flr1NadtYvNie8QMR7HpXLO0JpdApxW+uolB2OQBQ+z6ku9uB0w Gu1ibLhUaYcC6+6ad4Vu+ksrM7KgWVolj2kswaxzMvq82KtV9x8lpsysI9nsxxVa DcMwNzctN5ydZTeh++mpTZD9NLPkG0HtR/nSOPewOxNbyxQY0Vo8XwjvBeCBM8+K vBsAoDgqhl6mQkh92keiHhr2HW2FE5RpeNBJ34QqZA7dE2a5DTA= =W12Y -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 06 15:59:28 2019 Received: (at submit) by debbugs.gnu.org; 6 Aug 2019 19:59:28 +0000 Received: from localhost ([127.0.0.1]:37831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hv5cD-0004jV-Ra for submit@debbugs.gnu.org; Tue, 06 Aug 2019 15:59:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:44347) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hv5cB-0004jL-3x for submit@debbugs.gnu.org; Tue, 06 Aug 2019 15:59:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59344) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hv5cA-0001Jk-0w for guix-patches@gnu.org; Tue, 06 Aug 2019 15:59:22 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hv5c8-0006Ky-Vr for guix-patches@gnu.org; Tue, 06 Aug 2019 15:59:21 -0400 Received: from dustycloud.org ([2600:3c02::f03c:91ff:feae:cb51]:45468) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hv5c8-0006Km-Rp for guix-patches@gnu.org; Tue, 06 Aug 2019 15:59:20 -0400 Received: from twig (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id 56D4F26618; Tue, 6 Aug 2019 15:59:19 -0400 (EDT) References: <87h874ihzo.fsf@sdf.lonestar.org> <87r267v2fj.fsf@sdf.lonestar.org> User-agent: mu4e 1.2.0; emacs 26.2 From: Christopher Lemmer Webber To: guix-patches@gnu.org Subject: Re: [bug#36847] [PATCH v2] machine: Rename 'system' field. In-reply-to: <87r267v2fj.fsf@sdf.lonestar.org> Date: Tue, 06 Aug 2019 15:59:18 -0400 Message-ID: <87h86uoyjt.fsf@dustycloud.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2600:3c02::f03c:91ff:feae:cb51 X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: 36847-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Merged & pushed. Jakob L. Kreuze writes: > * gnu/machine.scm (machine-system): Delete variable. > (machine-operating-system): New variable. > All callers changed. > * doc/guix.texi (Invoking guix deploy): Use the > 'machine-operating-system' accessor rather than 'machine-system'. > --- > doc/guix.texi | 4 ++-- > gnu/machine.scm | 12 ++++++------ > gnu/machine/ssh.scm | 2 +- > 3 files changed, 9 insertions(+), 9 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 > diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm > index 552eafa9de..d1c90b6313 100644 > --- a/gnu/machine/ssh.scm > +++ b/gnu/machine/ssh.scm > @@ -166,7 +166,7 @@ of MACHINE's system profile, ordered from most recent to oldest." > environment type of 'managed-host." > (maybe-raise-unsupported-configuration-error machine) > (mlet %store-monad ((boot-parameters (machine-boot-parameters machine))) > - (let* ((os (machine-system machine)) > + (let* ((os (machine-operating-system machine)) > (eval (cut machine-remote-eval machine <>)) > (menu-entries (map boot-parameters->menu-entry boot-parameters)) > (bootloader-configuration (operating-system-bootloader os)) From unknown Wed Jun 25 00:27:09 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 04 Sep 2019 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator