diff options
| author | Andreas Enge <andreas@enge.fr> | 2024-07-02 17:06:42 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2024-09-18 11:21:06 +0200 |
| commit | 1c088531cf0be8fe6706c4624a920fca2ab2fee0 (patch) | |
| tree | 83bae2daf7540dc7b1ddcb1111dda2826eab4b2a | |
| parent | fb8c4916be554ddf55e21508922d9b398a584f8a (diff) | |
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
Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>
| -rw-r--r-- | doc/guix.texi | 2 | ||||
| -rw-r--r-- | gnu/services/guix.scm | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 2ae79f03e65..52e36e4354b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi | |||
| @@ -39763,6 +39763,8 @@ derivations aren't already available. | |||
| 39763 | URLs from which to attempt to fetch substitutes for build inputs, if the | 39763 | URLs from which to attempt to fetch substitutes for build inputs, if the |
| 39764 | input store items aren't already available. | 39764 | input store items aren't already available. |
| 39765 | 39765 | ||
| 39766 | @item @code{extra-options} (default: @var{'()}) | ||
| 39767 | Extra command line options for @code{guix-build-coordinator-agent}. | ||
| 39766 | @end table | 39768 | @end table |
| 39767 | @end deftp | 39769 | @end deftp |
| 39768 | 39770 | ||
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index fdeaeeb472d..6c58b3a2924 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm | |||
| @@ -66,6 +66,7 @@ | |||
| 66 | guix-build-coordinator-agent-configuration-max-1min-load-average | 66 | guix-build-coordinator-agent-configuration-max-1min-load-average |
| 67 | guix-build-coordinator-agent-configuration-derivation-substitute-urls | 67 | guix-build-coordinator-agent-configuration-derivation-substitute-urls |
| 68 | guix-build-coordinator-agent-configuration-non-derivation-substitute-urls | 68 | guix-build-coordinator-agent-configuration-non-derivation-substitute-urls |
| 69 | guix-build-coordinator-agent-configuration-extra-options | ||
| 69 | 70 | ||
| 70 | guix-build-coordinator-agent-password-auth | 71 | guix-build-coordinator-agent-password-auth |
| 71 | guix-build-coordinator-agent-password-auth? | 72 | guix-build-coordinator-agent-password-auth? |
| @@ -209,7 +210,10 @@ | |||
| 209 | (default #f)) | 210 | (default #f)) |
| 210 | (non-derivation-substitute-urls | 211 | (non-derivation-substitute-urls |
| 211 | guix-build-coordinator-agent-configuration-non-derivation-substitute-urls | 212 | guix-build-coordinator-agent-configuration-non-derivation-substitute-urls |
| 212 | (default #f))) | 213 | (default #f)) |
| 214 | (extra-options | ||
| 215 | guix-build-coordinator-agent-configuration-extra-options | ||
| 216 | (default '()))) | ||
| 213 | 217 | ||
| 214 | (define-record-type* <guix-build-coordinator-agent-password-auth> | 218 | (define-record-type* <guix-build-coordinator-agent-password-auth> |
| 215 | guix-build-coordinator-agent-password-auth | 219 | guix-build-coordinator-agent-password-auth |
| @@ -410,6 +414,7 @@ | |||
| 410 | max-parallel-builds max-parallel-uploads | 414 | max-parallel-builds max-parallel-uploads |
| 411 | max-allocated-builds max-1min-load-average | 415 | max-allocated-builds max-1min-load-average |
| 412 | derivation-substitute-urls non-derivation-substitute-urls | 416 | derivation-substitute-urls non-derivation-substitute-urls |
| 417 | extra-options | ||
| 413 | systems) | 418 | systems) |
| 414 | (list | 419 | (list |
| 415 | (shepherd-service | 420 | (shepherd-service |
| @@ -469,6 +474,7 @@ | |||
| 469 | "--non-derivation-substitute-urls=" | 474 | "--non-derivation-substitute-urls=" |
| 470 | (string-join non-derivation-substitute-urls " "))) | 475 | (string-join non-derivation-substitute-urls " "))) |
| 471 | #~()) | 476 | #~()) |
| 477 | #$@extra-options | ||
| 472 | #$@(map (lambda (system) | 478 | #$@(map (lambda (system) |
| 473 | (string-append "--system=" system)) | 479 | (string-append "--system=" system)) |
| 474 | (or systems '()))) | 480 | (or systems '()))) |
