ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guix-build-coordinator: Update to 0-53.3de63f1.

Browse source 
* 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.
This commit is contained in:
Christopher Baines 2022-05-25 09:18:07 +01:00
parent 436afdfe46
commit c4ad275709
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/guix.texi
View file

@ -34845,6 +34845,12 @@ derivations to build.
The Guix Data Service instance from which to query to find out about The Guix Data Service instance from which to query to find out about
derivations to build. derivations to build.
@item @code{guix-data-service-build-server-id} (default: @code{#f})
The Guix Data Service build server ID coresponding to the builds being
submitted. Providing this speeds up the submitting of builds as
derivations that have already been submitted can be skipped before
asking the coordinator to build them.
@item @code{processed-commits-file} (default: @code{"/var/cache/guix-build-coordinator-queue-builds/processed-commits"}) @item @code{processed-commits-file} (default: @code{"/var/cache/guix-build-coordinator-queue-builds/processed-commits"})
A file to record which commits have been processed, to avoid needlessly A file to record which commits have been processed, to avoid needlessly
processing them again if the service is restarted. processing them again if the service is restarted.

6
gnu/packages/package-management.scm
View file

@ -1318,8 +1318,8 @@ (define-public gwl
(license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public guix-build-coordinator (define-public guix-build-coordinator
(let ((commit "ed3c806ab83c77c1b8f04bb399c66743f1858178") (let ((commit "3de63f1f66d5f0eb157ee60bc864404f386ee2b0")
(revision "52")) (revision "53"))
(package (package
(name "guix-build-coordinator") (name "guix-build-coordinator")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -1330,7 +1330,7 @@ (define-public guix-build-coordinator
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1b2xsax548q43jh95m7jza2lafiljciljxavrvhpx8xsj0nlsffc")) "1ld761c48ad925p3kisnjvad50p6hyk77z0yjcr29681n73xzzz4"))
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

14
gnu/services/guix.scm
View file

@ -92,6 +92,7 @@ (define-module (gnu services guix)
guix-build-coordinator-queue-builds-configuration-systems guix-build-coordinator-queue-builds-configuration-systems
guix-build-coordinator-queue-builds-configuration-system-and-targets guix-build-coordinator-queue-builds-configuration-system-and-targets
guix-build-coordinator-queue-builds-configuration-guix-data-service guix-build-coordinator-queue-builds-configuration-guix-data-service
guix-build-coordinator-queue-builds-configuration-guix-data-service-build-server-id
guix-build-coordinator-queue-builds-configuration-processed-commits-file guix-build-coordinator-queue-builds-configuration-processed-commits-file
guix-build-coordinator-queue-builds-service-type guix-build-coordinator-queue-builds-service-type
@ -230,6 +231,9 @@ (define-record-type* <guix-build-coordinator-queue-builds-configuration>
(guix-data-service (guix-data-service
guix-build-coordinator-queue-builds-configuration-guix-data-service guix-build-coordinator-queue-builds-configuration-guix-data-service
(default "https://data.guix.gnu.org")) (default "https://data.guix.gnu.org"))
(guix-data-service-build-server-id
guix-build-coordinator-queue-builds-configuration-guix-data-service-build-server-id
(default #f))
(processed-commits-file (processed-commits-file
guix-build-coordinator-queue-builds-configuration-processed-commits-file guix-build-coordinator-queue-builds-configuration-processed-commits-file
(default "/var/cache/guix-build-coordinator-queue-builds/processed-commits"))) (default "/var/cache/guix-build-coordinator-queue-builds/processed-commits")))
@ -494,7 +498,9 @@ (define guix-build-coordinator-agent-service-type
(define (guix-build-coordinator-queue-builds-shepherd-services config) (define (guix-build-coordinator-queue-builds-shepherd-services config)
(match-record config <guix-build-coordinator-queue-builds-configuration> (match-record config <guix-build-coordinator-queue-builds-configuration>
(package user coordinator systems systems-and-targets (package user coordinator systems systems-and-targets
guix-data-service processed-commits-file) guix-data-service
guix-data-service-build-server-id
processed-commits-file)
(list (list
(shepherd-service (shepherd-service
(documentation "Guix Build Coordinator queue builds from Guix Data Service") (documentation "Guix Build Coordinator queue builds from Guix Data Service")
@ -517,6 +523,12 @@ (define (guix-build-coordinator-queue-builds-shepherd-services config)
#$@(if guix-data-service #$@(if guix-data-service
#~(#$(string-append "--guix-data-service=" guix-data-service)) #~(#$(string-append "--guix-data-service=" guix-data-service))
#~()) #~())
#$@(if guix-data-service-build-server-id
#~(#$(simple-format
#f
"--guix-data-service-build-server-id=~A"
guix-data-service-build-server-id))
#~())
#$@(if processed-commits-file #$@(if processed-commits-file
#~(#$(string-append "--processed-commits-file=" #~(#$(string-append "--processed-commits-file="
processed-commits-file)) processed-commits-file))