diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-01-15 15:13:07 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-01-15 15:43:22 +0100 |
| commit | deac976d3d26c7b85b9c90efb424b0aa94f1027c (patch) | |
| tree | 3987ac00a3277aa6df907e67fa88889c5b937ed0 /nix/libstore/worker-protocol.hh | |
| parent | 09cadc8e78858e2fc59ef34306b5672f3145b12a (diff) | |
| download | patches-deac976d3d26c7b85b9c90efb424b0aa94f1027c.tar patches-deac976d3d26c7b85b9c90efb424b0aa94f1027c.tar.gz | |
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.
Diffstat (limited to 'nix/libstore/worker-protocol.hh')
| -rw-r--r-- | nix/libstore/worker-protocol.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nix/libstore/worker-protocol.hh b/nix/libstore/worker-protocol.hh index bdeaca2e3a..efe9eadf23 100644 --- a/nix/libstore/worker-protocol.hh +++ b/nix/libstore/worker-protocol.hh @@ -6,7 +6,7 @@ namespace nix { #define WORKER_MAGIC_1 0x6e697863 #define WORKER_MAGIC_2 0x6478696f -#define PROTOCOL_VERSION 0x160 +#define PROTOCOL_VERSION 0x161 #define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00) #define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff) |