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/nix-daemon/guix-daemon.cc | |
| parent | 09cadc8e78858e2fc59ef34306b5672f3145b12a (diff) | |
| download | gnu-guix-deac976d3d26c7b85b9c90efb424b0aa94f1027c.tar gnu-guix-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/nix-daemon/guix-daemon.cc')
| -rw-r--r-- | nix/nix-daemon/guix-daemon.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc index d5d33a587a..aa47a290d2 100644 --- a/nix/nix-daemon/guix-daemon.cc +++ b/nix/nix-daemon/guix-daemon.cc @@ -1,5 +1,5 @@ /* GNU Guix --- Functional package management for GNU - Copyright (C) 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> + Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> This file is part of GNU Guix. @@ -301,8 +301,9 @@ main (int argc, char *argv[]) /* Turn automatic deduplication on by default. */ settings.autoOptimiseStore = true; - /* Default to using as many cores as possible. */ + /* Default to using as many cores as possible and one job at a time. */ settings.buildCores = 0; + settings.maxBuildJobs = 1; argvSaved = argv; |