[bug#44143] [PATCH 0/5] Guix Build Coordinator service fixes

[bug#44143] [PATCH 0/5] Guix Build Coordinator service fixes

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 613 bytes --]


These patches fix the things I missed with the first pass at the service
for the Guix Build Coordinator.

Christopher Baines (5):
  services: guix: Fix hooks gexp issue for the Guix Build Coordinator.
  gnu: guix-build-coordinator: Ensure gnutls is available.
  services: guix-build-coordinator: Output the start script name.
  services: guix-build-coordinator: Include the system profile in PATH.
  services: guix-build-coordinator: Configure output buffering.

 gnu/packages/package-management.scm |  2 ++
 gnu/services/guix.scm               | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#44143] [PATCH 1/5] services: guix: Fix hooks gexp issue for the Guix Build Coordinator.

[Christopher Baines]

* gnu/services/guix.scm (make-guix-build-coordinator-start-script): Fix
handling the name within the hook gexp.
---
 gnu/services/guix.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm
index bd7ebcd2aa..665267f5e3 100644
--- a/gnu/services/guix.scm
+++ b/gnu/services/guix.scm
@@ -209,7 +209,7 @@
                 (hooks
                  (list #$@(map (match-lambda
                                  ((name . hook-gexp)
-                                  #~(cons name #$hook-gexp)))
+                                  #~(cons '#$name #$hook-gexp)))
                                hooks)))
                 (hooks-with-defaults
                  `(,@hooks
-- 
2.28.0

[bug#44143] [PATCH 2/5] gnu: guix-build-coordinator: Ensure gnutls is available.

[Christopher Baines]

Some hooks expect this to be available.

* gnu/packages/package-management.scm (guix-build-coordinator)
[inputs,native-inputs]: Add gnutls.
---
 gnu/packages/package-management.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 45c3d4d5cf..349897fd16 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1048,6 +1048,7 @@ environments.")
      `(("pkg-config" ,pkg-config)
        ("autoconf" ,autoconf)
        ("automake" ,automake)
+       ("gnutls" ,gnutls)
 
        ;; Guile libraries are needed here for cross-compilation.
        ("guile-json" ,guile-json-3)
@@ -1066,6 +1067,7 @@ environments.")
        ("guile-zlib" ,guile-zlib)
        ("guile-sqlite3" ,guile-sqlite3)
        ("guix" ,guix)
+       ("gnutls" ,gnutls)
        ("sqlite" ,sqlite)
        ("sqitch" ,sqitch)))
     (home-page "https://git.cbaines.net/guix/build-coordinator/")
-- 
2.28.0

[bug#44143] [PATCH 3/5] services: guix-build-coordinator: Output the start script name.

[Christopher Baines]

As this can be useful for debugging purposes.

* gnu/services/guix.scm (make-guix-build-coordinator-start-script): Output the
current filename.
---
 gnu/services/guix.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm
index 665267f5e3..1666733e9c 100644
--- a/gnu/services/guix.scm
+++ b/gnu/services/guix.scm
@@ -200,6 +200,8 @@
                       (guix-build-coordinator build-allocator)
                       (guix-build-coordinator coordinator))
 
+         (simple-format #t "starting the guix-build-coordinator:\n  ~A\n"
+                        (current-filename))
          (let* ((metrics-registry (make-metrics-registry
                                    #:namespace
                                    "guixbuildcoordinator_"))
-- 
2.28.0

[bug#44143] [PATCH 4/5] services: guix-build-coordinator: Include the system profile in PATH.

[Christopher Baines]

As this allows hooks to use the system profile, if that's desired.

* gnu/services/guix.scm (guix-build-coordinator-shepherd-services): Set PATH
to include the system profile.
---
 gnu/services/guix.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm
index 1666733e9c..ac2a03147c 100644
--- a/gnu/services/guix.scm
+++ b/gnu/services/guix.scm
@@ -267,7 +267,8 @@
                 #:environment-variables
                 `(,(string-append
                     "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
-                  "LC_ALL=en_US.utf8")
+                  "LC_ALL=en_US.utf8"
+                  "PATH=/run/current-system/profile/bin") ; for hooks
                 #:log-file "/var/log/guix-build-coordinator/coordinator.log"))
       (stop #~(make-kill-destructor))))))
 
-- 
2.28.0

[bug#44143] [PATCH 5/5] services: guix-build-coordinator: Configure output buffering.

[Christopher Baines]

Otherwise the logging is garbled.

* gnu/services/guix.scm (make-guix-build-coordinator-start-script): Configure
line output buffering for stdout and stderr.
---
 gnu/services/guix.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm
index ac2a03147c..4afe02792f 100644
--- a/gnu/services/guix.scm
+++ b/gnu/services/guix.scm
@@ -200,6 +200,9 @@
                       (guix-build-coordinator build-allocator)
                       (guix-build-coordinator coordinator))
 
+         (setvbuf (current-output-port) 'line)
+         (setvbuf (current-error-port) 'line)
+
          (simple-format #t "starting the guix-build-coordinator:\n  ~A\n"
                         (current-filename))
          (let* ((metrics-registry (make-metrics-registry
-- 
2.28.0

[bug#44143] [PATCH 0/5] Guix Build Coordinator service fixes

[Mathieu Othacehe]

Hello Chris,

> These patches fix the things I missed with the first pass at the service
> for the Guix Build Coordinator.

This patchset seems fine to me.

Thanks,

Mathieu

bug#44143: [PATCH 0/5] Guix Build Coordinator service fixes

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 271 bytes --]


Mathieu Othacehe <othacehe@gnu.org> writes:

> Hello Chris,
>
>> These patches fix the things I missed with the first pass at the service
>> for the Guix Build Coordinator.
>
> This patchset seems fine to me.

Great, I've pushed this plus even more fixes to master now.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]