andreas pushed a commit to branch wip-plmshift in repository guix. commit b91685abdecdb42c0ac2e30e5cb5032b11b5d269 Author: Andreas Enge <andr...@enge.fr> AuthorDate: Tue Jul 2 17:06:42 2024 +0200
services: guix-build-coordinator-agent: Add extra-options. * gnu/services/guix.scm (<guix-build-coordinator-agent-configuration>): Add field extra-options. (guix-build-coordinator-agent-shepherd-services): Add and use EXTRA-OPTIONS argument. * doc/guix.texi (Guix Services): Adapt the documentation. Change-Id: I9e7e258e03e2b6553aa1570f5fcfaf3b0ada3e15 --- doc/guix.texi | 2 ++ gnu/services/guix.scm | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index d4d00fd4b8..8bfb342253 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -39682,6 +39682,8 @@ derivations aren't already available. URLs from which to attempt to fetch substitutes for build inputs, if the input store items aren't already available. +@item @code{extra-options} (default: @var{'()}) +Extra command line options for @code{guix-build-coordinator-agent}. @end table @end deftp diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index fdeaeeb472..9177883b21 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020, 2021, 2022 Christopher Baines <m...@cbaines.net> ;;; Copyright © 2024 Andrew Tropin <and...@trop.in> +;;; Copyright © 2024 Andreas Enge <andr...@enge.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,6 +67,7 @@ guix-build-coordinator-agent-configuration-max-1min-load-average guix-build-coordinator-agent-configuration-derivation-substitute-urls guix-build-coordinator-agent-configuration-non-derivation-substitute-urls + guix-build-coordinator-agent-configuration-extra-options guix-build-coordinator-agent-password-auth guix-build-coordinator-agent-password-auth? @@ -209,7 +211,10 @@ (default #f)) (non-derivation-substitute-urls guix-build-coordinator-agent-configuration-non-derivation-substitute-urls - (default #f))) + (default #f)) + (extra-options + guix-build-coordinator-agent-configuration-extra-options + (default '()))) (define-record-type* <guix-build-coordinator-agent-password-auth> guix-build-coordinator-agent-password-auth @@ -410,6 +415,7 @@ max-parallel-builds max-parallel-uploads max-allocated-builds max-1min-load-average derivation-substitute-urls non-derivation-substitute-urls + extra-options systems) (list (shepherd-service @@ -469,6 +475,7 @@ "--non-derivation-substitute-urls=" (string-join non-derivation-substitute-urls " "))) #~()) + #$@extra-options #$@(map (lambda (system) (string-append "--system=" system)) (or systems '())))