diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-01-21 15:32:35 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-01-21 23:09:55 +0100 |
commit | de9fbe9cdcf5f8deb08becfc54b523084fd67bda (patch) | |
tree | 92922d56823c6c7ade981915081e1c69939c6697 /guix/ssh.scm | |
parent | 3a0b2c6c6efd221341def2adf17279a9566555f7 (diff) | |
download | gnu-guix-de9fbe9cdcf5f8deb08becfc54b523084fd67bda.tar gnu-guix-de9fbe9cdcf5f8deb08becfc54b523084fd67bda.tar.gz |
store: Rename <nix-server> to <store-connection>.
* guix/store.scm (<nix-server>): Rename to...
(<store-connection>): ... this. Adjust users accordingly.
(nix-server?, nix-server-major-version)
(nix-server-minor-version, nix-server-socket)
(nix-server-version): Define as deprecated aliases.
* guix/inferior.scm: Adjust accordingly.
* guix/ssh.scm: Likewise.
Diffstat (limited to 'guix/ssh.scm')
-rw-r--r-- | guix/ssh.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/ssh.scm b/guix/ssh.scm index d90cb77be0..77329618d5 100644 --- a/guix/ssh.scm +++ b/guix/ssh.scm @@ -180,7 +180,7 @@ right away." (socket-name "/var/guix/daemon-socket/socket")) "Connect to the remote build daemon listening on SOCKET-NAME over SESSION, -an SSH session. Return a <nix-server> object." +an SSH session. Return a <store-connection> object." (open-connection #:port (remote-daemon-channel session socket-name))) @@ -288,7 +288,7 @@ REMOTE, a remote store. When RECURSIVE? is true, send the closure of FILES. Return the list of store items actually sent." ;; Compute the subset of FILES missing on SESSION and send them. (let* ((files (if recursive? (requisites local files) files)) - (session (channel-get-session (nix-server-socket remote))) + (session (channel-get-session (store-connection-socket remote))) (missing (inferior-remote-eval `(begin (use-modules (guix) @@ -345,7 +345,7 @@ Return the list of store items actually sent." (define (remote-store-session remote) "Return the SSH channel beneath REMOTE, a remote store as returned by 'connect-to-remote-daemon', or #f." - (channel-get-session (nix-server-socket remote))) + (channel-get-session (store-connection-socket remote))) (define (remote-store-host remote) "Return the name of the host REMOTE is connected to, where REMOTE is a |