diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-08-07 22:26:55 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-08-07 22:26:55 +0200 |
| commit | 9bd1333e587c92fb3f0c12e080cb89e41713df01 (patch) | |
| tree | f053e0174c052df046ef2ad320bcc5cdc8c76b01 /gnu/machine.scm | |
| parent | 378d94e51b00c30b19a39154278d01f1f3c4dbc1 (diff) | |
| parent | 55e238f2ab24ce347047ebc7fd7c5eba62dac69d (diff) | |
| download | guix-9bd1333e587c92fb3f0c12e080cb89e41713df01.tar guix-9bd1333e587c92fb3f0c12e080cb89e41713df01.tar.gz | |
Merge remote-tracking branch 'origin/master' into wip-texlive
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 |