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/inferior.scm | |
| parent | 3a0b2c6c6efd221341def2adf17279a9566555f7 (diff) | |
| download | guix-de9fbe9cdcf5f8deb08becfc54b523084fd67bda.tar 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/inferior.scm')
| -rw-r--r-- | guix/inferior.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/guix/inferior.scm b/guix/inferior.scm index 9f19e7d316..6cfa146029 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -26,9 +26,9 @@ version>? version-prefix? cache-directory)) #:use-module ((guix store) - #:select (nix-server-socket - nix-server-major-version - nix-server-minor-version + #:select (store-connection-socket + store-connection-major-version + store-connection-minor-version store-lift)) #:use-module ((guix derivations) #:select (read-derivation-from-file)) @@ -424,8 +424,8 @@ thus be the code of a one-argument procedure that accepts a store." (chmod directory #o700) (let* ((name (string-append directory "/inferior")) (socket (socket AF_UNIX SOCK_STREAM 0)) - (major (nix-server-major-version store)) - (minor (nix-server-minor-version store)) + (major (store-connection-major-version store)) + (minor (store-connection-minor-version store)) (proto (logior major minor))) (bind socket AF_UNIX name) (listen socket 1024) @@ -451,7 +451,7 @@ thus be the code of a one-argument procedure that accepts a store." inferior) (match (accept socket) ((client . address) - (proxy client (nix-server-socket store)))) + (proxy client (store-connection-socket store)))) (close-port socket) (read-inferior-response inferior))))) |