From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 01 16:02:05 2020 Received: (at submit) by debbugs.gnu.org; 1 Mar 2020 21:02:05 +0000 Received: from localhost ([127.0.0.1]:37029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j8Viv-0007Pr-2D for submit@debbugs.gnu.org; Sun, 01 Mar 2020 16:02:05 -0500 Received: from lists.gnu.org ([209.51.188.17]:35918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j8Vit-0007Pk-Sz for submit@debbugs.gnu.org; Sun, 01 Mar 2020 16:02:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52858) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8Vis-0007pZ-U1 for guix-patches@gnu.org; Sun, 01 Mar 2020 16:02:03 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8Vir-0004WP-T2 for guix-patches@gnu.org; Sun, 01 Mar 2020 16:02:02 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:59115) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1j8Vir-0004WC-Nh for guix-patches@gnu.org; Sun, 01 Mar 2020 16:02:01 -0500 Received: from localhost (unknown [46.237.162.11]) by mira.cbaines.net (Postfix) with ESMTPSA id 2DE0027BBE4 for ; Sun, 1 Mar 2020 21:02:00 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id d45cb090 for ; Sun, 1 Mar 2020 21:01:52 +0000 (UTC) User-agent: mu4e 1.2.0; emacs 26.3 From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH 0/2] Update the Guix Data Service package, and tweak the service Date: Sun, 01 Mar 2020 21:01:52 +0000 Message-ID: <87k143eqm7.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27 X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain 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(-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl5cIsBfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xecbg/+NMSNc/e3gjkMrKormqSsGsEiE9uXhIGFGrehBPlOx9/3XOta/9fKsCJ2 gfggnudmijtYgysiFv2ROXSPB4Om6N8O8Z5sq0KvRY3Gi+TnyCwkL/c79fYsek6j 9d04cv2T52Uu3KdEKcp6NjQ1bTL42rvTWfQsWvMZjzcPcd5l2IfFwXU1A45xrB03 j+hE9FIOGBLD89wX3G8wm7YMbZjfEZV6VrisW8upI6KoSvyhboZ8EnnmYeYA9mHg 3EZxldFvSrvlQM8uz8WQd1hBd9Sumqqaz2XTEUqI8GSWjwDLpoCncg/oT796xCaM 9GwqgtXJZsLRuYKNT6RA5MGndQhTrbktyN+IvW8W7y+DwAC18lIm/TzH4pzfpJyw /h5Zz9NgJF0mxFIflMR1jHom/YLUuwGi1ypLWuczplvjZh9G7+u+VrU7ENxBPSxM fu3nG1gNKkQ+Crrb3EV/eDTiazC9QCh6l7hFHQubfcjzpyDW08y/7ZTGGkUyf/0S ZWpfsWDEdbhvpWsiNKlXdKNW9t00M8wdVrEA4ZAQoDAeQvAhkmfzprywx5YY6Tbq /8reyrJXgKJPO8yfsAFykEyuy4QjyQlvA87LSl2ARxS55lWhH8LF4e4I3IQ4TZIz YpbM7lxgKbgNHX5uSaRmsBWrLlE4ZqaHRX2bxI0T7z9zFviI3LU= =96BM -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 01 16:13:36 2020 Received: (at 39864) by debbugs.gnu.org; 1 Mar 2020 21:13:36 +0000 Received: from localhost ([127.0.0.1]:37036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j8Vu4-0007jB-5q for submit@debbugs.gnu.org; Sun, 01 Mar 2020 16:13:36 -0500 Received: from mira.cbaines.net ([212.71.252.8]:47372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j8Vu2-0007iy-VM for 39864@debbugs.gnu.org; Sun, 01 Mar 2020 16:13:35 -0500 Received: from localhost (unknown [46.237.162.11]) by mira.cbaines.net (Postfix) with ESMTPSA id 40C2927BBEA for <39864@debbugs.gnu.org>; Sun, 1 Mar 2020 21:13:34 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id c1ab640a for <39864@debbugs.gnu.org>; Sun, 1 Mar 2020 21:13:31 +0000 (UTC) From: Christopher Baines To: 39864@debbugs.gnu.org Subject: [PATCH 2/2] services: guix-data-service: Allow passing extra options. Date: Sun, 1 Mar 2020 21:13:31 +0000 Message-Id: <20200301211331.21163-2-mail@cbaines.net> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200301211331.21163-1-mail@cbaines.net> References: <20200301211331.21163-1-mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 39864 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 (): 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 - (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 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 01 16:13:37 2020 Received: (at 39864) by debbugs.gnu.org; 1 Mar 2020 21:13:37 +0000 Received: from localhost ([127.0.0.1]:37038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j8Vu4-0007jE-Hx for submit@debbugs.gnu.org; Sun, 01 Mar 2020 16:13:36 -0500 Received: from mira.cbaines.net ([212.71.252.8]:47370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j8Vu3-0007ix-1S for 39864@debbugs.gnu.org; Sun, 01 Mar 2020 16:13:35 -0500 Received: from localhost (unknown [46.237.162.11]) by mira.cbaines.net (Postfix) with ESMTPSA id 1BC1627BBE4 for <39864@debbugs.gnu.org>; Sun, 1 Mar 2020 21:13:34 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 3da53425 for <39864@debbugs.gnu.org>; Sun, 1 Mar 2020 21:13:31 +0000 (UTC) From: Christopher Baines To: 39864@debbugs.gnu.org Subject: [PATCH 1/2] gnu: guix-data-service: Update to 0.0.1-18.18eb9df. Date: Sun, 1 Mar 2020 21:13:30 +0000 Message-Id: <20200301211331.21163-1-mail@cbaines.net> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 39864 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 07 16:20:57 2020 Received: (at 39864) by debbugs.gnu.org; 7 Mar 2020 21:20:57 +0000 Received: from localhost ([127.0.0.1]:47671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jAgsS-0001Lt-Qs for submit@debbugs.gnu.org; Sat, 07 Mar 2020 16:20:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jAgsR-0001Lf-Hx for 39864@debbugs.gnu.org; Sat, 07 Mar 2020 16:20:55 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jAgsM-0007YC-Ep; Sat, 07 Mar 2020 16:20:50 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=34396 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jAgsL-000456-RF; Sat, 07 Mar 2020 16:20:50 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Christopher Baines Subject: Re: [bug#39864] [PATCH 0/2] Update the Guix Data Service package, and tweak the service References: <87k143eqm7.fsf@cbaines.net> Date: Sat, 07 Mar 2020 22:20:48 +0100 In-Reply-To: <87k143eqm7.fsf@cbaines.net> (Christopher Baines's message of "Sun, 01 Mar 2020 21:01:52 +0000") Message-ID: <87h7yzeua7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39864 Cc: 39864@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hullo, Christopher Baines 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=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 08 19:43:29 2020 Received: (at 39864-done) by debbugs.gnu.org; 8 Mar 2020 23:43:29 +0000 Received: from localhost ([127.0.0.1]:49485 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jB5Zw-0000ti-Qf for submit@debbugs.gnu.org; Sun, 08 Mar 2020 19:43:28 -0400 Received: from mira.cbaines.net ([212.71.252.8]:55404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jB5Zv-0000ta-P9 for 39864-done@debbugs.gnu.org; Sun, 08 Mar 2020 19:43:28 -0400 Received: from localhost (unknown [46.237.162.11]) by mira.cbaines.net (Postfix) with ESMTPSA id 9BD6B27BBE4; Sun, 8 Mar 2020 23:43:26 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id cff9a539; Sun, 8 Mar 2020 23:43:24 +0000 (UTC) References: <87k143eqm7.fsf@cbaines.net> <87h7yzeua7.fsf@gnu.org> User-agent: mu4e 1.2.0; emacs 26.3 From: Christopher Baines To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#39864] [PATCH 0/2] Update the Guix Data Service package, and tweak the service In-reply-to: <87h7yzeua7.fsf@gnu.org> Date: Sun, 08 Mar 2020 23:43:22 +0000 Message-ID: <87a74qe7l1.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 39864-done Cc: 39864-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hullo, > > Christopher Baines 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 :) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl5lgxpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XeyIRAAsTKUE0PKADt7tjMKF0IsL78zZRp98UCbeXw8qyOWn7fqMb7gOFq10FjH g2DHyS9Urig22F9QXSBnp3XQcRa93gL9NaMFGOV7ysiRYJ5Dbc5GpKPBlngi2GD8 aerWqMXDzT+1xtQCVEbPH7FX6An7jHVUOiDQsHulokzYAzLxZdy4N1XoVYkcEGKb 03pAxvCaavdS9xufcTnGMiLY7a48q8cKd1Hje16viLnZXc+oHPNyKpjkuVI+Nqka PtymAh7TpvQ6GiFFCXwWWG3Ajd44c0HoAZJcl4dDxFDnmT+3EDdZpn9sA5q44BAN GMhld/WpLmErhtAyGdpIq/8gwUeyWySM28+PrjI0tewtgB5+CTJAqoC2ArSIrtJs FpajwBSCwlvGrV+5ts4lumUk2ncysnHP0m0FW7MGqyYCHGQL1UdUfY/V6qXmyMxh kSaP1a0p3mCIseNi/qB8bJFeX18BLUKpQEQ5byDAyv9e4RZTcUL5zCM+5FdvQjur 6YBMaRCTmv/UHRjlO+J4f+NIOMm1SPAxLSB9ASUyDV43v62ueOpulvLfcEyWCLzo Ign0xshaGc+nh8uqtJA/5Rz6jjdpC29MXt1aio9Icd12vwTpFIOnV4xOh527hiZG MYu9xVLRWweSIfkneQz5Cdti50Yw1yrVKXpRiqgovFVrWN4jeFg= =sDS5 -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 15 08:59:22 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 06 Apr 2020 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator