ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade Nix worker protocol.

Browse source 
We were already relying on the new version in `set-build-options', so
this patch fixes that.

* guix/store.scm (%protocol-version): Increase.
  (open-connection)[reserve-space?]: New argument.  Pass it to the
  server when it's recent enough.
This commit is contained in:
Ludovic Courtès 2012-07-02 00:45:23 +02:00
parent 561eaf7144
commit e36a717216
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
guix/store.scm
View file

@ -53,7 +53,7 @@ (define-module (guix store)
store-path? store-path?
derivation-path?)) derivation-path?))
(define %protocol-version #x109) (define %protocol-version #x10b)
(define %worker-magic-1 #x6e697863) (define %worker-magic-1 #x6e697863)
(define %worker-magic-2 #x6478696f) (define %worker-magic-2 #x6478696f)
@ -257,7 +257,8 @@ (define-condition-type &nix-protocol-error &nix-error
(message nix-protocol-error-message) (message nix-protocol-error-message)
(status nix-protocol-error-status)) (status nix-protocol-error-status))
(define* (open-connection #:optional (file %default-socket-path)) (define* (open-connection #:optional (file %default-socket-path)
#:key (reserve-space? #t))
(let ((s (with-fluids ((%default-port-encoding #f)) (let ((s (with-fluids ((%default-port-encoding #f))
;; This trick allows use of the `scm_c_read' optimization. ;; This trick allows use of the `scm_c_read' optimization.
(socket PF_UNIX SOCK_STREAM 0))) (socket PF_UNIX SOCK_STREAM 0)))
@ -271,6 +272,8 @@ (define* (open-connection #:optional (file %default-socket-path))
(protocol-major v)) (protocol-major v))
(begin (begin
(write-int %protocol-version s) (write-int %protocol-version s)
(if (>= (protocol-minor v) 11)
(write-int (if reserve-space? 1 0) s))
(let ((s (%make-nix-server s (let ((s (%make-nix-server s
(protocol-major v) (protocol-major v)
(protocol-minor v)))) (protocol-minor v))))