* [bug#67811] [PATCH 0/3] Make some Guix Build Coordiantor updates
@ 2023-12-13 12:42 Christopher Baines
2023-12-13 12:48 ` [bug#67811] [PATCH 1/3] services: guix: Remove guix-build-coordinator-queue-builds service Christopher Baines
2023-12-22 17:36 ` bug#67811: [PATCH 0/3] Make some Guix Build Coordiantor updates Christopher Baines
0 siblings, 2 replies; 5+ messages in thread
From: Christopher Baines @ 2023-12-13 12:42 UTC (permalink / raw)
To: 67811
[-- Attachment #1: Type: text/plain, Size: 515 bytes --]
Christopher Baines (3):
services: guix: Remove guix-build-coordinator-queue-builds service.
services: guix: Move GUIX_LOCPATH handling to packages.
gnu: guix-build-coordinator: Update to 0-93.e4af682.
doc/guix.texi | 52 ----------
gnu/packages/package-management.scm | 13 ++-
gnu/services/guix.scm | 143 +---------------------------
3 files changed, 11 insertions(+), 197 deletions(-)
base-commit: 06f25a9a85be1bbe7a709e58ce41c1a834e5f1ae
--
2.41.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#67811] [PATCH 1/3] services: guix: Remove guix-build-coordinator-queue-builds service.
2023-12-13 12:42 [bug#67811] [PATCH 0/3] Make some Guix Build Coordiantor updates Christopher Baines
@ 2023-12-13 12:48 ` Christopher Baines
2023-12-13 12:48 ` [bug#67811] [PATCH 2/3] services: guix: Move GUIX_LOCPATH handling to packages Christopher Baines
2023-12-13 12:48 ` [bug#67811] [PATCH 3/3] gnu: guix-build-coordinator: Update to 0-93.e4af682 Christopher Baines
2023-12-22 17:36 ` bug#67811: [PATCH 0/3] Make some Guix Build Coordiantor updates Christopher Baines
1 sibling, 2 replies; 5+ messages in thread
From: Christopher Baines @ 2023-12-13 12:48 UTC (permalink / raw)
To: 67811
This has been effectively replaced by the bffe.
* gnu/services/guix.scm (<guix-data-service-configuration>): Remove record
type.
(guix-build-coordinator-queue-builds-shepherd-services,
guix-build-coordinator-queue-builds-activation,
guix-build-coordinator-queue-builds-account): Remove procedures
(guix-build-coordinator-queue-builds-service-type): Remove service type.
Change-Id: I2a233fb10b12cc9bfddebaa35928b25c243f82a2
---
doc/guix.texi | 52 -----------------
gnu/services/guix.scm | 133 ------------------------------------------
2 files changed, 185 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 7dde9b727b..60a62fa3f0 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -38606,58 +38606,6 @@ Guix Services
@end table
@end deftp
-The Guix Build Coordinator package contains a script to query an
-instance of the Guix Data Service for derivations to build, and then
-submit builds for those derivations to the coordinator. The service
-type below assists in running this script. This is an additional tool
-that may be useful when building derivations contained within an
-instance of the Guix Data Service.
-
-@defvar guix-build-coordinator-queue-builds-service-type
-Service type for the
-guix-build-coordinator-queue-builds-from-guix-data-service script. Its
-value must be a @code{guix-build-coordinator-queue-builds-configuration}
-object.
-@end defvar
-
-@deftp {Data Type} guix-build-coordinator-queue-builds-configuration
-Data type representing the options to the queue builds from guix data
-service script.
-
-@table @asis
-@item @code{package} (default: @code{guix-build-coordinator})
-The Guix Build Coordinator package to use.
-
-@item @code{user} (default: @code{"guix-build-coordinator-queue-builds"})
-The system user to run the service as.
-
-@item @code{coordinator} (default: @code{"http://localhost:8746"})
-The URI to use when connecting to the coordinator.
-
-@item @code{systems} (default: @code{#f})
-The systems for which to fetch derivations to build.
-
-@item @code{systems-and-targets} (default: @code{#f})
-An association list of system and target pairs for which to fetch
-derivations to build.
-
-@item @code{guix-data-service} (default: @code{"https://data.guix.gnu.org"})
-The Guix Data Service instance from which to query to find out about
-derivations to build.
-
-@item @code{guix-data-service-build-server-id} (default: @code{#f})
-The Guix Data Service build server ID corresponding 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"})
-A file to record which commits have been processed, to avoid needlessly
-processing them again if the service is restarted.
-
-@end table
-@end deftp
-
@subsubheading Guix Data Service
The @uref{http://data.guix.gnu.org,Guix Data Service} processes, stores
and provides data about GNU Guix. This includes information about
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm
index 389903451a..ff6cce507e 100644
--- a/gnu/services/guix.scm
+++ b/gnu/services/guix.scm
@@ -88,19 +88,6 @@ (define-module (gnu services guix)
guix-build-coordinator-agent-service-type
- guix-build-coordinator-queue-builds-configuration
- guix-build-coordinator-queue-builds-configuration?
- guix-build-coordinator-queue-builds-configuration-package
- guix-build-coordinator-queue-builds-configuration-user
- guix-build-coordinator-queue-builds-coordinator
- guix-build-coordinator-queue-builds-configuration-systems
- 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-build-server-id
- guix-build-coordinator-queue-builds-configuration-processed-commits-file
-
- guix-build-coordinator-queue-builds-service-type
-
<guix-data-service-configuration>
guix-data-service-configuration
guix-data-service-configuration?
@@ -250,31 +237,6 @@ (define-record-type* <guix-build-coordinator-agent-dynamic-auth-with-file>
(agent-name guix-build-coordinator-agent-dynamic-auth-with-file-agent-name)
(token-file guix-build-coordinator-agent-dynamic-auth-with-file-token-file))
-(define-record-type* <guix-build-coordinator-queue-builds-configuration>
- guix-build-coordinator-queue-builds-configuration
- make-guix-build-coordinator-queue-builds-configuration
- guix-build-coordinator-queue-builds-configuration?
- (package guix-build-coordinator-queue-builds-configuration-package
- (default guix-build-coordinator))
- (user guix-build-coordinator-queue-builds-configuration-user
- (default "guix-build-coordinator-queue-builds"))
- (coordinator guix-build-coordinator-queue-builds-coordinator
- (default "http://localhost:8746"))
- (systems guix-build-coordinator-queue-builds-configuration-systems
- (default #f))
- (systems-and-targets
- guix-build-coordinator-queue-builds-configuration-system-and-targets
- (default #f))
- (guix-data-service
- guix-build-coordinator-queue-builds-configuration-guix-data-service
- (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
- guix-build-coordinator-queue-builds-configuration-processed-commits-file
- (default "/var/cache/guix-build-coordinator-queue-builds/processed-commits")))
-
(define* (make-guix-build-coordinator-start-script database-uri-string
allocation-strategy
pid-file
@@ -559,101 +521,6 @@ (define guix-build-coordinator-agent-service-type
(description
"Run a Guix Build Coordinator agent.")))
-(define (guix-build-coordinator-queue-builds-shepherd-services config)
- (match-record config <guix-build-coordinator-queue-builds-configuration>
- (package user coordinator systems systems-and-targets
- guix-data-service
- guix-data-service-build-server-id
- processed-commits-file)
- (list
- (shepherd-service
- (documentation "Guix Build Coordinator queue builds from Guix Data Service")
- (provision '(guix-build-coordinator-queue-builds))
- (requirement '(networking))
- (start
- #~(lambda _
- (parameterize ((%current-logfile-date-format ""))
- (fork+exec-command
- (list
- #$(file-append
- package
- "/bin/guix-build-coordinator-queue-builds-from-guix-data-service")
- #$(string-append "--coordinator=" coordinator)
- #$@(map (lambda (system)
- (string-append "--system=" system))
- (or systems '()))
- #$@(map (match-lambda
- ((system . target)
- (string-append "--system-and-target=" system "=" target)))
- (or systems-and-targets '()))
- #$@(if 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
- #~(#$(string-append "--processed-commits-file="
- processed-commits-file))
- #~()))
- #:user #$user
- #:environment-variables
- `(,(string-append
- "GUIX_LOCPATH="
- #$(libc-utf8-locales-for-target) "/lib/locale")
- "LC_ALL=en_US.utf8")
- #:log-file "/var/log/guix-build-coordinator/queue-builds.log"))))
- (stop #~(make-kill-destructor))
- (modules
- `((shepherd comm)
- ,@%default-modules))))))
-
-(define (guix-build-coordinator-queue-builds-activation config)
- #~(begin
- (use-modules (guix build utils))
-
- (define %user
- (getpw #$(guix-build-coordinator-queue-builds-configuration-user
- config)))
-
- (mkdir-p "/var/log/guix-build-coordinator")
-
- ;; Allow writing the processed commits file
- (mkdir-p "/var/cache/guix-build-coordinator-queue-builds")
- (chown "/var/cache/guix-build-coordinator-queue-builds"
- (passwd:uid %user)
- (passwd:gid %user))))
-
-(define (guix-build-coordinator-queue-builds-account config)
- (list (user-account
- (name (guix-build-coordinator-queue-builds-configuration-user config))
- (group "nogroup")
- (system? #t)
- (comment "Guix Build Coordinator queue-builds user")
- (home-directory "/var/empty")
- (shell (file-append shadow "/sbin/nologin")))))
-
-(define guix-build-coordinator-queue-builds-service-type
- (service-type
- (name 'guix-build-coordinator-queue-builds)
- (extensions
- (list
- (service-extension shepherd-root-service-type
- guix-build-coordinator-queue-builds-shepherd-services)
- (service-extension activation-service-type
- guix-build-coordinator-queue-builds-activation)
- (service-extension account-service-type
- guix-build-coordinator-queue-builds-account)))
- (description
- "Run the guix-build-coordinator-queue-builds-from-guix-data-service
-script.
-
-This is a script to assist in having the Guix Build Coordinator build
-derivations stored in an instance of the Guix Data Service.")))
-
\f
;;;
;;; Guix Data Service
base-commit: 06f25a9a85be1bbe7a709e58ce41c1a834e5f1ae
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#67811] [PATCH 2/3] services: guix: Move GUIX_LOCPATH handling to packages.
2023-12-13 12:48 ` [bug#67811] [PATCH 1/3] services: guix: Remove guix-build-coordinator-queue-builds service Christopher Baines
@ 2023-12-13 12:48 ` Christopher Baines
2023-12-13 12:48 ` [bug#67811] [PATCH 3/3] gnu: guix-build-coordinator: Update to 0-93.e4af682 Christopher Baines
1 sibling, 0 replies; 5+ messages in thread
From: Christopher Baines @ 2023-12-13 12:48 UTC (permalink / raw)
To: 67811
I think this might be better than handling it in the service. I'm seeing
locale issues on the hurd which I hope this will address.
* gnu/packages/package-management.scm (guix-build-coordinator,
guix-build-coordinator/agent-only):
* gnu/services/guix.scm (guix-build-coordinator-shepherd-services,
guix-build-coordinator-agent-shepherd-services):
Change-Id: I07ca424f434854176326a19177dc5573d53b59c2
---
gnu/packages/package-management.scm | 7 ++++++-
gnu/services/guix.scm | 10 ++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 30216f518a..e73c142236 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1570,6 +1570,9 @@ (define-public guix-build-coordinator
,@(or (and=> (assoc-ref inputs "sqitch")
list)
'())))
+ `("GUIX_LOCPATH" ":" prefix
+ (,(string-append (assoc-ref inputs "glibc-utf8-locales")
+ "/lib/locale")))
`("GUILE_LOAD_PATH" ":" prefix
(,scm ,(string-join
(map (lambda (input)
@@ -1608,6 +1611,7 @@ (define-public guix-build-coordinator
(list (first (assoc-ref (package-native-inputs guix) "guile"))
sqlite
bash-minimal
+ (libc-utf8-locales-for-target)
sqitch))
(propagated-inputs
(list guile-prometheus
@@ -1647,7 +1651,8 @@ (define-public guix-build-coordinator/agent-only
(first (assoc-ref (package-native-inputs guix) "guile"))))
(inputs
(list (first (assoc-ref (package-native-inputs guix) "guile"))
- bash-minimal))
+ bash-minimal
+ (libc-utf8-locales-for-target)))
(propagated-inputs
(list guile-prometheus
guile-gcrypt
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm
index ff6cce507e..17599193e3 100644
--- a/gnu/services/guix.scm
+++ b/gnu/services/guix.scm
@@ -342,10 +342,7 @@ (define (guix-build-coordinator-shepherd-services config)
;; Allow time for migrations to run
#:pid-file-timeout 60
#:environment-variables
- `(,(string-append
- "GUIX_LOCPATH="
- #$(libc-utf8-locales-for-target) "/lib/locale")
- "LC_ALL=en_US.utf8"
+ `("LC_ALL=en_US.utf8"
"PATH=/run/current-system/profile/bin" ; for hooks
#$@extra-environment-variables)
#:log-file "/var/log/guix-build-coordinator/coordinator.log")
@@ -470,10 +467,7 @@ (define (guix-build-coordinator-agent-shepherd-services config)
(or systems '())))
#:user #$user
#:environment-variables
- `(,(string-append
- "GUIX_LOCPATH="
- #$(libc-utf8-locales-for-target) "/lib/locale")
- ;; XDG_CACHE_HOME is used by Guix when caching narinfo files
+ `(;; XDG_CACHE_HOME is used by Guix when caching narinfo files
"XDG_CACHE_HOME=/var/cache/guix-build-coordinator-agent"
"LC_ALL=en_US.utf8")
#:log-file "/var/log/guix-build-coordinator/agent.log"))))
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#67811] [PATCH 3/3] gnu: guix-build-coordinator: Update to 0-93.e4af682.
2023-12-13 12:48 ` [bug#67811] [PATCH 1/3] services: guix: Remove guix-build-coordinator-queue-builds service Christopher Baines
2023-12-13 12:48 ` [bug#67811] [PATCH 2/3] services: guix: Move GUIX_LOCPATH handling to packages Christopher Baines
@ 2023-12-13 12:48 ` Christopher Baines
1 sibling, 0 replies; 5+ messages in thread
From: Christopher Baines @ 2023-12-13 12:48 UTC (permalink / raw)
To: 67811
* gnu/packages/package-management.scm (guix-build-coordinator): Update to
0-93.e4af682.
Change-Id: Ice91ef075db02d3f2bcb445d4fd5621bc00a02a0
---
gnu/packages/package-management.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index e73c142236..97ea41df66 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1510,8 +1510,8 @@ (define-public gwl/next
"0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc")))))))
(define-public guix-build-coordinator
- (let ((commit "78df0b3a9f4f27df8341da36d4dfa8e49dfad900")
- (revision "92"))
+ (let ((commit "e4af682452580298b34681d37818a16771a17c66")
+ (revision "93"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
@@ -1522,7 +1522,7 @@ (define-public guix-build-coordinator
(commit commit)))
(sha256
(base32
- "06xp38k6yfvsvl20hrqvmarpysd07nkbj53an729lqr50qdd4jcq"))
+ "1i8x9nfpvg832lxwbpjl1kadldpkcnjlxdxl4c5jqx2hz680ylf3"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#67811: [PATCH 0/3] Make some Guix Build Coordiantor updates
2023-12-13 12:42 [bug#67811] [PATCH 0/3] Make some Guix Build Coordiantor updates Christopher Baines
2023-12-13 12:48 ` [bug#67811] [PATCH 1/3] services: guix: Remove guix-build-coordinator-queue-builds service Christopher Baines
@ 2023-12-22 17:36 ` Christopher Baines
1 sibling, 0 replies; 5+ messages in thread
From: Christopher Baines @ 2023-12-22 17:36 UTC (permalink / raw)
To: 67811-done
[-- Attachment #1: Type: text/plain, Size: 562 bytes --]
Christopher Baines <mail@cbaines.net> writes:
> Christopher Baines (3):
> services: guix: Remove guix-build-coordinator-queue-builds service.
> services: guix: Move GUIX_LOCPATH handling to packages.
> gnu: guix-build-coordinator: Update to 0-93.e4af682.
>
> doc/guix.texi | 52 ----------
> gnu/packages/package-management.scm | 13 ++-
> gnu/services/guix.scm | 143 +---------------------------
> 3 files changed, 11 insertions(+), 197 deletions(-)
Pushed to master as aa631ea62ed9e417b72c45d8857291130a52debc.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-22 17:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-13 12:42 [bug#67811] [PATCH 0/3] Make some Guix Build Coordiantor updates Christopher Baines
2023-12-13 12:48 ` [bug#67811] [PATCH 1/3] services: guix: Remove guix-build-coordinator-queue-builds service Christopher Baines
2023-12-13 12:48 ` [bug#67811] [PATCH 2/3] services: guix: Move GUIX_LOCPATH handling to packages Christopher Baines
2023-12-13 12:48 ` [bug#67811] [PATCH 3/3] gnu: guix-build-coordinator: Update to 0-93.e4af682 Christopher Baines
2023-12-22 17:36 ` bug#67811: [PATCH 0/3] Make some Guix Build Coordiantor updates Christopher Baines
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.