diff options
| author | Christopher Baines <mail@cbaines.net> | 2025-05-11 09:54:23 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2025-05-11 10:19:11 +0100 |
| commit | 5137d4a96ce2d93e2db8bd6ec43df72793620b45 (patch) | |
| tree | aabd68f922bec733ff7fc3d3dd43b49889628745 /gnu/services | |
| parent | cfb8a4f0431235d1f00ab9a6b8be5b78e0013d60 (diff) | |
services: guix-build-coordinator: Allow passing extra arguments.
To avoid needing to support all possible configuration options in the Guix
service.
* gnu/services/guix.scm
(guix-build-coordinator-configuration-extra-build-coordinator-arguments): New
procedure.
* gnu/services/guix.scm (make-guix-build-coordinator-start-script): Support
extra-build-coordinator-arguments and include them when calling
make-build-coordinator.
(guix-build-coordinator-shepherd-services): Pass
extra-build-coordinator-arguments through when calling
make-guix-build-coordinator-start-script.
Change-Id: I6531275bf2922f762b3422746c6207b834656b5c
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/guix.scm | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index f7da528e662..854e6443a51 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | guix-build-coordinator-configuration-listen-repl | 51 | guix-build-coordinator-configuration-listen-repl |
| 52 | guix-build-coordinator-configuration-guile | 52 | guix-build-coordinator-configuration-guile |
| 53 | guix-build-coordinator-configuration-extra-environment-variables | 53 | guix-build-coordinator-configuration-extra-environment-variables |
| 54 | guix-build-coordinator-configuration-extra-build-coordinator-arguments | ||
| 54 | 55 | ||
| 55 | guix-build-coordinator-service-type | 56 | guix-build-coordinator-service-type |
| 56 | 57 | ||
| @@ -183,6 +184,9 @@ | |||
| 183 | (default guile-next)) | 184 | (default guile-next)) |
| 184 | (extra-environment-variables | 185 | (extra-environment-variables |
| 185 | guix-build-coordinator-configuration-extra-environment-variables | 186 | guix-build-coordinator-configuration-extra-environment-variables |
| 187 | (default '())) | ||
| 188 | (extra-build-coordinator-arguments | ||
| 189 | guix-build-coordinator-configuration-extra-build-coordinator-arguments | ||
| 186 | (default '()))) | 190 | (default '()))) |
| 187 | 191 | ||
| 188 | (define-record-type* <guix-build-coordinator-agent-configuration> | 192 | (define-record-type* <guix-build-coordinator-agent-configuration> |
| @@ -259,7 +263,9 @@ | |||
| 259 | (hooks '()) | 263 | (hooks '()) |
| 260 | (parallel-hooks '()) | 264 | (parallel-hooks '()) |
| 261 | (guile guile-next) | 265 | (guile guile-next) |
| 262 | listen-repl) | 266 | listen-repl |
| 267 | (extra-build-coordinator-arguments | ||
| 268 | '())) | ||
| 263 | (program-file | 269 | (program-file |
| 264 | "start-guix-build-coordinator" | 270 | "start-guix-build-coordinator" |
| 265 | (with-extensions (cons guix-build-coordinator-package | 271 | (with-extensions (cons guix-build-coordinator-package |
| @@ -302,7 +308,8 @@ | |||
| 302 | #:database-uri-string #$database-uri-string | 308 | #:database-uri-string #$database-uri-string |
| 303 | #:hooks hooks-with-defaults | 309 | #:hooks hooks-with-defaults |
| 304 | #:allocation-strategy #$allocation-strategy | 310 | #:allocation-strategy #$allocation-strategy |
| 305 | #:timestamp-log-output? #f))) | 311 | #:timestamp-log-output? #f |
| 312 | #$@extra-build-coordinator-arguments))) | ||
| 306 | 313 | ||
| 307 | (run-coordinator-service | 314 | (run-coordinator-service |
| 308 | build-coordinator | 315 | build-coordinator |
| @@ -329,7 +336,8 @@ | |||
| 329 | parallel-hooks | 336 | parallel-hooks |
| 330 | listen-repl | 337 | listen-repl |
| 331 | guile | 338 | guile |
| 332 | extra-environment-variables) | 339 | extra-environment-variables |
| 340 | extra-build-coordinator-arguments) | ||
| 333 | (list | 341 | (list |
| 334 | (shepherd-service | 342 | (shepherd-service |
| 335 | (documentation "Guix Build Coordinator") | 343 | (documentation "Guix Build Coordinator") |
| @@ -351,7 +359,9 @@ | |||
| 351 | #:hooks hooks | 359 | #:hooks hooks |
| 352 | #:parallel-hooks parallel-hooks | 360 | #:parallel-hooks parallel-hooks |
| 353 | #:listen-repl listen-repl | 361 | #:listen-repl listen-repl |
| 354 | #:guile guile)) | 362 | #:guile guile |
| 363 | #:extra-build-coordinator-arguments | ||
| 364 | extra-build-coordinator-arguments)) | ||
| 355 | #:user #$user | 365 | #:user #$user |
| 356 | #:group #$group | 366 | #:group #$group |
| 357 | #:directory "/var/lib/guix-build-coordinator" | 367 | #:directory "/var/lib/guix-build-coordinator" |
