[bug#39864] [PATCH 0/2] Update the Guix Data Service package, and tweak the service

[bug#39864] [PATCH 0/2] Update the Guix Data Service package, and tweak the service

[Christopher Baines]

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

Bump the revision used for the guix-data-service, and move to using
Guile 3 rather than 2. Also make it possible to pass options more easily
through the service.

Christopher Baines (2):
  gnu: guix-data-service: Update to 0.0.1-18.18eb9df.
  services: guix-data-service: Allow passing extra options.

 doc/guix.texi         |  6 ++++++
 gnu/packages/web.scm  | 18 +++++++++---------
 gnu/services/guix.scm | 15 +++++++++++----
 3 files changed, 26 insertions(+), 13 deletions(-)

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

[bug#39864] [PATCH 1/2] gnu: guix-data-service: Update to 0.0.1-18.18eb9df.

[Christopher Baines]

* gnu/packages/web.scm (guix-data-service): Update to 0.0.1-18.18eb9df.
(inputs, native-inputs): Switch to using the Guile 3 package variants where
applicable.
---
 gnu/packages/web.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index c6e59cff44..6a9cdc79b8 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4390,8 +4390,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
   (package-with-python2 python-feedparser))
 
 (define-public guix-data-service
-  (let ((commit "bf25a8db0278b49ef2149c69ef5d6dd2201fd413")
-        (revision "17"))
+  (let ((commit "18eb9dfdcb3174bfd4bab5b9089acffa13aa1214")
+        (revision "18"))
     (package
       (name "guix-data-service")
       (version (string-append "0.0.1-" revision "." (string-take commit 7)))
@@ -4403,7 +4403,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0s6faybczdn10zwrkn22nfq5lvf538513hbmjfaqlkhfmwc4s1qd"))))
+                  "0lb78cqzqaz0r4sspg272w2a3yhzhqah30j0kxf0z182b0qpmp37"))))
       (build-system gnu-build-system)
       (arguments
        '(#:modules ((guix build utils)
@@ -4452,15 +4452,15 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
                  #t)))
            (delete 'strip))))           ; As the .go files aren't compatible
       (inputs
-       `(("guix" ,guix)
-         ("guile-fibers" ,guile-fibers)
-         ("guile-json" ,guile-json-3)
-         ("guile-email" ,guile-email)
-         ("guile-squee" ,guile-squee)
+       `(("guix" ,guile3.0-guix)
+         ("guile-fibers" ,guile3.0-fibers)
+         ("guile-json" ,guile3.0-json)
+         ("guile-email" ,guile3.0-email)
+         ("guile-squee" ,guile3.0-squee)
          ("postgresql" ,postgresql)
          ("sqitch" ,sqitch)))
       (native-inputs
-       `(("guile" ,guile-2.2)
+       `(("guile" ,guile-3.0)
          ("autoconf" ,autoconf)
          ("automake" ,automake)
          ("ephemeralpg" ,ephemeralpg)
-- 
2.25.0

[bug#39864] [PATCH 2/2] services: guix-data-service: Allow passing extra options.

[Christopher Baines]

This is so that the options supported by the service configuration don't have
to always be changed. Generally though all options should be explicitly
supported and documented, so this is mostly to facilitate experimentation.

* gnu/services/guix.scm (<guix-data-service-configuration>): Add extra-options
and extra-process-jobs-options to the record type.
(guix-data-service-shepherd-services): Handle these new configuration record
fields.
* doc/guix.texi (Guix Data Service): Document these new options.
---
 doc/guix.texi         |  6 ++++++
 gnu/services/guix.scm | 15 +++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index fab9159530..80ba8a488e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -25245,6 +25245,12 @@ If set, this is the @code{getmail-retriever-configuration} object with
 which to configure getmail to fetch mail from the guix-commits mailing
 list.
 
+@item @code{extra-options} (default: @var{'()})
+Extra command line options for @code{guix-data-service}.
+
+@item @code{extra-process-jobs-options} (default: @var{'()})
+Extra command line options for @code{guix-data-service-process-jobs}.
+
 @end table
 @end deftp
 
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm
index 0f0fad39b0..10a8581a62 100644
--- a/gnu/services/guix.scm
+++ b/gnu/services/guix.scm
@@ -68,7 +68,12 @@
    (default #f))
   (commits-getmail-retriever-configuration
    guix-data-service-commits-getmail-retriever-configuration
-   (default #f)))
+   (default #f))
+  (extra-options    guix-data-service-extra-options
+                    (default '()))
+  (extra-process-jobs-options
+   guix-data-service-extra-process-jobs-options
+   (default '())))
 
 (define (guix-data-service-profile-packages config)
   "Return the guix-data-service package, this will populate the
@@ -78,7 +83,7 @@ ca-certificates.crt file in the system profile."
 
 (define (guix-data-service-shepherd-services config)
   (match-record config <guix-data-service-configuration>
-    (package user group port host)
+    (package user group port host extra-options extra-process-jobs-options)
     (list
      (shepherd-service
       (documentation "Guix Data Service web server")
@@ -92,7 +97,8 @@ ca-certificates.crt file in the system profile."
                       #$(string-append "--host=" host)
                       ;; Perform any database migrations when the
                       ;; service is started
-                      "--update-database")
+                      "--update-database"
+                      #$@extra-options)
 
                 #:user #$user
                 #:group #$group
@@ -117,7 +123,8 @@ ca-certificates.crt file in the system profile."
       (start #~(make-forkexec-constructor
                 (list
                  #$(file-append package
-                                "/bin/guix-data-service-process-jobs"))
+                                "/bin/guix-data-service-process-jobs")
+                 #$@extra-process-jobs-options)
                 #:user #$user
                 #:group #$group
                 #:environment-variables
-- 
2.25.0

[bug#39864] [PATCH 0/2] Update the Guix Data Service package, and tweak the service

[Ludovic Courtès]

Hullo,

Christopher Baines <mail@cbaines.net> skribis:

> Bump the revision used for the guix-data-service, and move to using
> Guile 3 rather than 2. Also make it possible to pass options more easily
> through the service.
>
> Christopher Baines (2):
>   gnu: guix-data-service: Update to 0.0.1-18.18eb9df.
>   services: guix-data-service: Allow passing extra options.

Both LGTM.  Thank you!

Ludo’.

bug#39864: [PATCH 0/2] Update the Guix Data Service package, and tweak the service

[Christopher Baines]

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


Ludovic Courtès <ludo@gnu.org> writes:

> Hullo,
>
> Christopher Baines <mail@cbaines.net> skribis:
>
>> Bump the revision used for the guix-data-service, and move to using
>> Guile 3 rather than 2. Also make it possible to pass options more easily
>> through the service.
>>
>> Christopher Baines (2):
>>   gnu: guix-data-service: Update to 0.0.1-18.18eb9df.
>>   services: guix-data-service: Allow passing extra options.
>
> Both LGTM.  Thank you!

Great, I've pushed these changes now :)

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