02/02: guix build: Do not force 'build-cores', 'max-build-jobs', and 'max-silent-time'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit d9da3a757d3081403081577c4e07763c9b809043
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jan 15 15:32:43 2017 +0100

    guix build: Do not force 'build-cores', 'max-build-jobs', and 
'max-silent-time'.
    
    This lets the daemon use its own default settings unless otherwise
    specified.
    
    * guix/scripts/build.scm (set-build-options-from-command-line): Do not
    provide default values for #:build-cores and #:max-build-jobs.
    (%default-options): Remove 'max-silent-time'.
---
 guix/scripts/build.scm |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index ccb4c27..551275e 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2013 Mark H Weaver <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -344,8 +344,8 @@ options handled by 'set-build-options-from-command-line', 
and listed in
                      #:keep-failed? (assoc-ref opts 'keep-failed?)
                      #:keep-going? (assoc-ref opts 'keep-going?)
                      #:rounds (assoc-ref opts 'rounds)
-                     #:build-cores (or (assoc-ref opts 'cores) 0)
-                     #:max-build-jobs (or (assoc-ref opts 'max-jobs) 1)
+                     #:build-cores (assoc-ref opts 'cores)
+                     #:max-build-jobs (assoc-ref opts 'max-jobs)
                      #:fallback? (assoc-ref opts 'fallback?)
                      #:use-substitutes? (assoc-ref opts 'substitutes?)
                      #:substitute-urls (assoc-ref opts 'substitute-urls)
@@ -462,7 +462,6 @@ options handled by 'set-build-options-from-command-line', 
and listed in
     (substitutes? . #t)
     (build-hook? . #t)
     (print-build-trace? . #t)
-    (max-silent-time . 3600)
     (verbosity . 0)))
 
 (define (show-help)