diff options
| author | Christopher Baines <mail@cbaines.net> | 2022-05-25 09:18:07 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2022-05-25 09:20:03 +0100 |
| commit | c4ad2757097b5989adc753565c22611f5a2c45cb (patch) | |
| tree | c971bd0ce2c494a67d1149513a79640e2f73cbe4 /gnu | |
| parent | 436afdfe46f6aac173ae161eb52367b7fdc30944 (diff) | |
gnu: guix-build-coordinator: Update to 0-53.3de63f1.
* gnu/packages/package-management.scm (guix-build-coordinator): Update to
0-53.3de63f1.
* gnu/services/guix.scm (guix-build-coordinator-queue-builds-configuration-guix-data-service-build-server-id):
New procedure.
(guix-build-coordinator-queue-builds-shepherd-services): Use the guix-data-service-build-server-id.
* doc/guix.texi (Guix Build Coordinator): Document the new queue builds
configuration field.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/package-management.scm | 6 | ||||
| -rw-r--r-- | gnu/services/guix.scm | 14 |
2 files changed, 16 insertions, 4 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ce97314481d..619458a0d35 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm | |||
| @@ -1318,8 +1318,8 @@ environments.") | |||
| 1318 | (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) | 1318 | (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) |
| 1319 | 1319 | ||
| 1320 | (define-public guix-build-coordinator | 1320 | (define-public guix-build-coordinator |
| 1321 | (let ((commit "ed3c806ab83c77c1b8f04bb399c66743f1858178") | 1321 | (let ((commit "3de63f1f66d5f0eb157ee60bc864404f386ee2b0") |
| 1322 | (revision "52")) | 1322 | (revision "53")) |
| 1323 | (package | 1323 | (package |
| 1324 | (name "guix-build-coordinator") | 1324 | (name "guix-build-coordinator") |
| 1325 | (version (git-version "0" revision commit)) | 1325 | (version (git-version "0" revision commit)) |
| @@ -1330,7 +1330,7 @@ environments.") | |||
| 1330 | (commit commit))) | 1330 | (commit commit))) |
| 1331 | (sha256 | 1331 | (sha256 |
| 1332 | (base32 | 1332 | (base32 |
| 1333 | "1b2xsax548q43jh95m7jza2lafiljciljxavrvhpx8xsj0nlsffc")) | 1333 | "1ld761c48ad925p3kisnjvad50p6hyk77z0yjcr29681n73xzzz4")) |
| 1334 | (file-name (string-append name "-" version "-checkout")))) | 1334 | (file-name (string-append name "-" version "-checkout")))) |
| 1335 | (build-system gnu-build-system) | 1335 | (build-system gnu-build-system) |
| 1336 | (arguments | 1336 | (arguments |
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index 83c293bbb5a..413bf51ad83 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm | |||
| @@ -92,6 +92,7 @@ | |||
| 92 | guix-build-coordinator-queue-builds-configuration-systems | 92 | guix-build-coordinator-queue-builds-configuration-systems |
| 93 | guix-build-coordinator-queue-builds-configuration-system-and-targets | 93 | guix-build-coordinator-queue-builds-configuration-system-and-targets |
| 94 | guix-build-coordinator-queue-builds-configuration-guix-data-service | 94 | guix-build-coordinator-queue-builds-configuration-guix-data-service |
| 95 | guix-build-coordinator-queue-builds-configuration-guix-data-service-build-server-id | ||
| 95 | guix-build-coordinator-queue-builds-configuration-processed-commits-file | 96 | guix-build-coordinator-queue-builds-configuration-processed-commits-file |
| 96 | 97 | ||
| 97 | guix-build-coordinator-queue-builds-service-type | 98 | guix-build-coordinator-queue-builds-service-type |
| @@ -230,6 +231,9 @@ | |||
| 230 | (guix-data-service | 231 | (guix-data-service |
| 231 | guix-build-coordinator-queue-builds-configuration-guix-data-service | 232 | guix-build-coordinator-queue-builds-configuration-guix-data-service |
| 232 | (default "https://data.guix.gnu.org")) | 233 | (default "https://data.guix.gnu.org")) |
| 234 | (guix-data-service-build-server-id | ||
| 235 | guix-build-coordinator-queue-builds-configuration-guix-data-service-build-server-id | ||
| 236 | (default #f)) | ||
| 233 | (processed-commits-file | 237 | (processed-commits-file |
| 234 | guix-build-coordinator-queue-builds-configuration-processed-commits-file | 238 | guix-build-coordinator-queue-builds-configuration-processed-commits-file |
| 235 | (default "/var/cache/guix-build-coordinator-queue-builds/processed-commits"))) | 239 | (default "/var/cache/guix-build-coordinator-queue-builds/processed-commits"))) |
| @@ -494,7 +498,9 @@ | |||
| 494 | (define (guix-build-coordinator-queue-builds-shepherd-services config) | 498 | (define (guix-build-coordinator-queue-builds-shepherd-services config) |
| 495 | (match-record config <guix-build-coordinator-queue-builds-configuration> | 499 | (match-record config <guix-build-coordinator-queue-builds-configuration> |
| 496 | (package user coordinator systems systems-and-targets | 500 | (package user coordinator systems systems-and-targets |
| 497 | guix-data-service processed-commits-file) | 501 | guix-data-service |
| 502 | guix-data-service-build-server-id | ||
| 503 | processed-commits-file) | ||
| 498 | (list | 504 | (list |
| 499 | (shepherd-service | 505 | (shepherd-service |
| 500 | (documentation "Guix Build Coordinator queue builds from Guix Data Service") | 506 | (documentation "Guix Build Coordinator queue builds from Guix Data Service") |
| @@ -517,6 +523,12 @@ | |||
| 517 | #$@(if guix-data-service | 523 | #$@(if guix-data-service |
| 518 | #~(#$(string-append "--guix-data-service=" guix-data-service)) | 524 | #~(#$(string-append "--guix-data-service=" guix-data-service)) |
| 519 | #~()) | 525 | #~()) |
| 526 | #$@(if guix-data-service-build-server-id | ||
| 527 | #~(#$(simple-format | ||
| 528 | #f | ||
| 529 | "--guix-data-service-build-server-id=~A" | ||
| 530 | guix-data-service-build-server-id)) | ||
| 531 | #~()) | ||
| 520 | #$@(if processed-commits-file | 532 | #$@(if processed-commits-file |
| 521 | #~(#$(string-append "--processed-commits-file=" | 533 | #~(#$(string-append "--processed-commits-file=" |
| 522 | processed-commits-file)) | 534 | processed-commits-file)) |
