(address . guix-patches@gnu.org)
* 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(-)
Toggle diff (57 lines)
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) ; <operating-system>
- (environment machine-environment) ; symbol
- (configuration machine-configuration ; configuration object
- (default #f))) ; specific to environment
+ (operating-system machine-operating-system) ; <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
--
2.22.0
-----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-----