andreas pushed a commit to branch wip-plmshift in repository guix. commit b95a332f3a2cdb9d3d28d273e3328eed09051fde Author: Andreas Enge <andr...@enge.fr> AuthorDate: Tue Jul 2 16:55:35 2024 +0200
services: guix-build-coordinator-agent: Remove defaults. * gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>) [max-parallel-builds, max-parallel-uploads]: Set default to #f. (guix-build-coordinator-agent-shepherd-services): Check for max-parallel-builds. * doc/guix.texi (Guix Services): Adapt the documentation. If set to #f, the default values are now taken as the defaults of the guix-build-coordinator-agent command. Change-Id: Ide6dde0e88aa0dc851b6295095f414ca2ddc72ac --- doc/guix.texi | 6 +++--- gnu/services/guix.scm | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7d0824784d..d4d00fd4b8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23,7 +23,7 @@ @copying Copyright @copyright{} 2012-2024 Ludovic Courtès@* -Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* +Copyright @copyright{} 2013, 2014, 2016, 2024 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* @@ -39656,10 +39656,10 @@ coordinator. Possible record types are described below. The systems for which this agent should fetch builds. The agent process will use the current system it's running on as the default. -@item @code{max-parallel-builds} (default: @code{1}) +@item @code{max-parallel-builds} (default: @code{#f}) The number of builds to perform in parallel. -@item @code{max-parallel-uploads} (default: @code{1}) +@item @code{max-parallel-uploads} (default: @code{#f}) The number of uploads to perform in parallel. @item @code{max-allocated-builds} (default: @code{#f}) diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index 0182c21ea7..fdeaeeb472 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -194,10 +194,10 @@ (default #f)) (max-parallel-builds guix-build-coordinator-agent-configuration-max-parallel-builds - (default 1)) + (default #f)) (max-parallel-uploads guix-build-coordinator-agent-configuration-max-parallel-uploads - (default 1)) + (default #f)) (max-allocated-builds guix-build-coordinator-agent-configuration-max-allocated-builds (default #f)) @@ -443,8 +443,10 @@ #~(#$(string-append "--name=" agent-name) #$(string-append "--dynamic-auth-token-file=" token-file)))) - #$(simple-format #f "--max-parallel-builds=~A" - max-parallel-builds) + #$@(if max-parallel-builds + #~(#$(simple-format #f "--max-parallel-builds=~A" + max-parallel-builds)) + #~()) #$@(if max-parallel-uploads #~(#$(simple-format #f "--max-parallel-uploads=~A" max-parallel-uploads))