diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-08-13 20:42:06 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-08-13 20:42:06 +0200 |
commit | 462ad9f56b9665b8d22960acee73ad91f1052c9c (patch) | |
tree | 814be463d6d0517e7db9b9e6f15dbc7516955674 /gnu/machine.scm | |
parent | 7f5f61ae99321a7a6e08b0100cd428e11ce6a837 (diff) | |
parent | 1b1b006afd31c5526f34d157baef492c7dde2e9c (diff) | |
download | patches-462ad9f56b9665b8d22960acee73ad91f1052c9c.tar patches-462ad9f56b9665b8d22960acee73ad91f1052c9c.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/machine.scm')
-rw-r--r-- | gnu/machine.scm | 12 |
1 files changed, 6 insertions, 6 deletions
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 |