daemon: Client settings no longer override daemon settings.
authorLudovic Courtès <ludo@gnu.org>
Sun, 15 Jan 2017 14:13:07 +0000 (15:13 +0100)
committerLudovic Courtès <ludo@gnu.org>
Sun, 15 Jan 2017 14:43:22 +0000 (15:43 +0100)
commitdeac976d3d26c7b85b9c90efb424b0aa94f1027c
tree3987ac00a3277aa6df907e67fa88889c5b937ed0
parent09cadc8e78858e2fc59ef34306b5672f3145b12a
daemon: Client settings no longer override daemon settings.

Fixes <http://bugs.gnu.org/20217>.

* nix/libstore/worker-protocol.hh (PROTOCOL_VERSION): Bump to 0x161.
* nix/nix-daemon/nix-daemon.cc (performOp): "build-max-jobs",
"build-max-silent-time", and "build-cores" are no longer read upfront;
instead, read them from the key/value list at the end.
* nix/nix-daemon/guix-daemon.cc (main): Explicitly set
'settings.maxBuildJobs'.
* guix/store.scm (%protocol-version): Bump to #x161.
(set-build-options): #:max-build-jobs, #:max-silent-time, and
 #:build-cores now default to #f.  Adjust handshake to new protocol.
* tests/store.scm ("build-cores"): New test.
* tests/guix-daemon.sh: Add test for default "build-cores" value.
guix/store.scm
nix/libstore/worker-protocol.hh
nix/nix-daemon/guix-daemon.cc
nix/nix-daemon/nix-daemon.cc
tests/guix-daemon.sh
tests/store.scm