From unknown Sun Aug 17 01:51:37 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40162] [PATCH] gnu: guix-data-service: Update to 0.0.1-19.d12909d. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Mar 2020 09:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40162 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40162@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158478258824501 (code B ref -1); Sat, 21 Mar 2020 09:24:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Mar 2020 09:23:08 +0000 Received: from localhost ([127.0.0.1]:45942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jFaLU-0006N7-CT for submit@debbugs.gnu.org; Sat, 21 Mar 2020 05:23:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:46727) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jFaLS-0006Mz-AR for submit@debbugs.gnu.org; Sat, 21 Mar 2020 05:23:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48829) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFaLR-0004rL-49 for guix-patches@gnu.org; Sat, 21 Mar 2020 05:23:06 -0400 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 1jFaLP-0007iS-UX for guix-patches@gnu.org; Sat, 21 Mar 2020 05:23:04 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42898) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jFaLP-0007hr-PE for guix-patches@gnu.org; Sat, 21 Mar 2020 05:23:03 -0400 Received: from localhost (unknown [46.237.162.18]) by mira.cbaines.net (Postfix) with ESMTPSA id 232A427BBE4 for ; Sat, 21 Mar 2020 09:23:02 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 7b30d458 for ; Sat, 21 Mar 2020 09:22:59 +0000 (UTC) From: Christopher Baines Date: Sat, 21 Mar 2020 09:22:59 +0000 Message-Id: <20200321092259.2729-1-mail@cbaines.net> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.71.252.8 X-Spam-Score: 0.3 (/) 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 (/) These changes support the guix-data-service-backup-database and guix-data-service-create-small-backup scripts. These are shell scripts, s= o require coreutils from the build environment at runtime as well as binari= es from postgresql, ephemeralpg and optionally util-linux (for ionice and renice). * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-19.d12909d. [arguments]: Add (ice-9 ftw) and (ice-9 match) to #:modules, change the 'install phase to wrap all bin files with the PATH at build time. [inputs]: Add util-linux and include ephemeralpg from native-inputs. [native-inputs]: Move ephemeralpg to inputs. --- gnu/packages/web.scm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 10cbf6165b..3bcc067b4c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4381,8 +4381,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (package-with-python2 python-feedparser)) =20 (define-public guix-data-service - (let ((commit "18eb9dfdcb3174bfd4bab5b9089acffa13aa1214") - (revision "18")) + (let ((commit "d12909d57282babfc55f1eef96bc478c17821c85") + (revision "19")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit = 7))) @@ -4394,11 +4394,13 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (file-name (git-file-name name version)) (sha256 (base32 - "0lb78cqzqaz0r4sspg272w2a3yhzhqah30j0kxf0z182b0qpmp37"= )))) + "1zh6awrs2qgkrrz4d9212an1ggspmsadjdysgf215z5zkc25lpf7"= )))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) (guix build gnu-build-system) + (ice-9 ftw) + (ice-9 match) (ice-9 rdelim) (ice-9 popen)) #:test-target "check-with-tmp-database" @@ -4426,20 +4428,20 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") "/site-ccache"))) (for-each (lambda (file) + (simple-format (current-error-port) + "wrapping: ~A\n" + (string-append bin "/" file)) (wrap-program (string-append bin "/" file) `("PATH" ":" prefix - (,bin)) + (,bin ,(getenv "PATH"))) `("GUILE_LOAD_PATH" ":" prefix (,scm ,(getenv "GUILE_LOAD_PATH"))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))) - '("guix-data-service" - "guix-data-service-process-branch-updated-email" - "guix-data-service-process-branch-updated-mbox" - "guix-data-service-process-job" - "guix-data-service-process-jobs" - "guix-data-service-manage-build-servers" - "guix-data-service-query-build-servers")) + (scandir bin + (match-lambda + ((or "." "..") #f) + (_ #t)))) #t))) (delete 'strip)))) ; As the .go files aren't compat= ible (inputs @@ -4448,13 +4450,14 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") ("guile-json" ,guile3.0-json) ("guile-email" ,guile3.0-email) ("guile-squee" ,guile3.0-squee) + ("ephemeralpg" ,ephemeralpg) + ("util-linux" ,util-linux) ("postgresql" ,postgresql) ("sqitch" ,sqitch))) (native-inputs `(("guile" ,guile-3.0) ("autoconf" ,autoconf) ("automake" ,automake) - ("ephemeralpg" ,ephemeralpg) ("emacs-minimal" ,emacs-minimal) ("emacs-htmlize" ,emacs-htmlize) ("pkg-config" ,pkg-config))) --=20 2.25.1 From unknown Sun Aug 17 01:51:37 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40162] [PATCH] gnu: guix-data-service: Update to 0.0.1-19.d12909d. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Mar 2020 21:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40162 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: 40162@debbugs.gnu.org Received: via spool by 40162-submit@debbugs.gnu.org id=B40162.158482741329742 (code B ref 40162); Sat, 21 Mar 2020 21:51:02 +0000 Received: (at 40162) by debbugs.gnu.org; 21 Mar 2020 21:50:13 +0000 Received: from localhost ([127.0.0.1]:48320 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jFm0T-0007je-AR for submit@debbugs.gnu.org; Sat, 21 Mar 2020 17:50:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40882) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jFm0R-0007jH-P9 for 40162@debbugs.gnu.org; Sat, 21 Mar 2020 17:50:12 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:51588) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jFm0M-0002MI-FS; Sat, 21 Mar 2020 17:50:06 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=56252 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jFm0L-00032l-Dv; Sat, 21 Mar 2020 17:50:06 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200321092259.2729-1-mail@cbaines.net> Date: Sat, 21 Mar 2020 22:50:02 +0100 In-Reply-To: <20200321092259.2729-1-mail@cbaines.net> (Christopher Baines's message of "Sat, 21 Mar 2020 09:22:59 +0000") Message-ID: <874kuhxtrp.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-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 (-) Hi! Christopher Baines skribis: > These changes support the guix-data-service-backup-database and > guix-data-service-create-small-backup scripts. These are shell scripts, so > require coreutils from the build environment at runtime as well as binari= es > from postgresql, ephemeralpg and optionally util-linux (for ionice and > renice). > > * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-19.d12909d. > [arguments]: Add (ice-9 ftw) and (ice-9 match) to #:modules, change the > 'install phase to wrap all bin files with the PATH at build time. > [inputs]: Add util-linux and include ephemeralpg from native-inputs. > [native-inputs]: Move ephemeralpg to inputs. [...] > (lambda (file) > + (simple-format (current-error-port) > + "wrapping: ~A\n" > + (string-append bin "/" file)) > (wrap-program (string-append bin "/" file) > `("PATH" ":" prefix > - (,bin)) > + (,bin ,(getenv "PATH"))) If I=E2=80=99m not mistaken, this would keep references to GCC, etc. What about explicitly listing the things that you list above? Thanks, Ludo=E2=80=99. From unknown Sun Aug 17 01:51:37 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40162] [PATCH] gnu: guix-data-service: Update to 0.0.1-19.d12909d. References: <20200321092259.2729-1-mail@cbaines.net> In-Reply-To: <20200321092259.2729-1-mail@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Mar 2020 21:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40162 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40162@debbugs.gnu.org Received: via spool by 40162-submit@debbugs.gnu.org id=B40162.15852580057194 (code B ref 40162); Thu, 26 Mar 2020 21:27:01 +0000 Received: (at 40162) by debbugs.gnu.org; 26 Mar 2020 21:26:45 +0000 Received: from localhost ([127.0.0.1]:60274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jHa1V-0001rw-19 for submit@debbugs.gnu.org; Thu, 26 Mar 2020 17:26:45 -0400 Received: from mira.cbaines.net ([212.71.252.8]:52286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jHa1T-0001rp-JJ for 40162@debbugs.gnu.org; Thu, 26 Mar 2020 17:26:44 -0400 Received: from localhost (unknown [46.237.161.230]) by mira.cbaines.net (Postfix) with ESMTPSA id 7EBDA27BBE4 for <40162@debbugs.gnu.org>; Thu, 26 Mar 2020 21:26:42 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 610f0d32 for <40162@debbugs.gnu.org>; Thu, 26 Mar 2020 21:26:40 +0000 (UTC) From: Christopher Baines Date: Thu, 26 Mar 2020 21:26:40 +0000 Message-Id: <20200326212640.10610-1-mail@cbaines.net> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) 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 (-) These changes support the guix-data-service-backup-database and guix-data-service-create-small-backup scripts. These are shell scripts, so require coreutils from the build environment at runtime as well as binaries from postgresql, ephemeralpg and optionally util-linux (for ionice and renice). * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-19.d12909d. [arguments]: Add (ice-9 ftw) and (ice-9 match) to #:modules, change the 'install phase to wrap all bin files with some inputs as well. [inputs]: Add util-linux and include ephemeralpg from native-inputs. [native-inputs]: Move ephemeralpg to inputs. --- gnu/packages/web.scm | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 10cbf6165b..86d3f41efc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4381,8 +4381,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (package-with-python2 python-feedparser)) (define-public guix-data-service - (let ((commit "18eb9dfdcb3174bfd4bab5b9089acffa13aa1214") - (revision "18")) + (let ((commit "d1c243f7fd8902f359ff06fb78dce663cf4297ce") + (revision "19")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4394,11 +4394,13 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (file-name (git-file-name name version)) (sha256 (base32 - "0lb78cqzqaz0r4sspg272w2a3yhzhqah30j0kxf0z182b0qpmp37")))) + "1ji8d4vwmv7j9h7z96hvzi3zvik594yngjrdal37w13fbxy2v6sw")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) (guix build gnu-build-system) + (ice-9 ftw) + (ice-9 match) (ice-9 rdelim) (ice-9 popen)) #:test-target "check-with-tmp-database" @@ -4426,20 +4428,28 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") "/site-ccache"))) (for-each (lambda (file) + (simple-format (current-error-port) + "wrapping: ~A\n" + (string-append bin "/" file)) (wrap-program (string-append bin "/" file) `("PATH" ":" prefix - (,bin)) + ,(cons* + bin + (map (lambda (input) + (string-append + (assoc-ref inputs input) + "/bin")) + '("ephemeralpg" + "util-linux" + "postgresql")))) `("GUILE_LOAD_PATH" ":" prefix (,scm ,(getenv "GUILE_LOAD_PATH"))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))) - '("guix-data-service" - "guix-data-service-process-branch-updated-email" - "guix-data-service-process-branch-updated-mbox" - "guix-data-service-process-job" - "guix-data-service-process-jobs" - "guix-data-service-manage-build-servers" - "guix-data-service-query-build-servers")) + (scandir bin + (match-lambda + ((or "." "..") #f) + (_ #t)))) #t))) (delete 'strip)))) ; As the .go files aren't compatible (inputs @@ -4448,13 +4458,14 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") ("guile-json" ,guile3.0-json) ("guile-email" ,guile3.0-email) ("guile-squee" ,guile3.0-squee) + ("ephemeralpg" ,ephemeralpg) + ("util-linux" ,util-linux) ("postgresql" ,postgresql) ("sqitch" ,sqitch))) (native-inputs `(("guile" ,guile-3.0) ("autoconf" ,autoconf) ("automake" ,automake) - ("ephemeralpg" ,ephemeralpg) ("emacs-minimal" ,emacs-minimal) ("emacs-htmlize" ,emacs-htmlize) ("pkg-config" ,pkg-config))) -- 2.26.0 From unknown Sun Aug 17 01:51:37 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40162] [PATCH] gnu: guix-data-service: Update to 0.0.1-19.d12909d. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Mar 2020 21:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40162 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 40162@debbugs.gnu.org Received: via spool by 40162-submit@debbugs.gnu.org id=B40162.15852580927357 (code B ref 40162); Thu, 26 Mar 2020 21:29:02 +0000 Received: (at 40162) by debbugs.gnu.org; 26 Mar 2020 21:28:12 +0000 Received: from localhost ([127.0.0.1]:60278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jHa2u-0001ub-D4 for submit@debbugs.gnu.org; Thu, 26 Mar 2020 17:28:12 -0400 Received: from mira.cbaines.net ([212.71.252.8]:52288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jHa2s-0001uS-9G for 40162@debbugs.gnu.org; Thu, 26 Mar 2020 17:28:10 -0400 Received: from localhost (unknown [46.237.161.230]) by mira.cbaines.net (Postfix) with ESMTPSA id CBE8827BBE4; Thu, 26 Mar 2020 21:28:09 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 303ce45a; Thu, 26 Mar 2020 21:28:07 +0000 (UTC) References: <20200321092259.2729-1-mail@cbaines.net> <874kuhxtrp.fsf@gnu.org> User-agent: mu4e 1.2.0; emacs 26.3 From: Christopher Baines In-reply-to: <874kuhxtrp.fsf@gnu.org> Date: Thu, 26 Mar 2020 21:28:05 +0000 Message-ID: <87tv2akdqy.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-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: > Hi! > > Christopher Baines skribis: > >> These changes support the guix-data-service-backup-database and >> guix-data-service-create-small-backup scripts. These are shell scripts, = so >> require coreutils from the build environment at runtime as well as binar= ies >> from postgresql, ephemeralpg and optionally util-linux (for ionice and >> renice). >> >> * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-19.d12909d. >> [arguments]: Add (ice-9 ftw) and (ice-9 match) to #:modules, change the >> 'install phase to wrap all bin files with the PATH at build time. >> [inputs]: Add util-linux and include ephemeralpg from native-inputs. >> [native-inputs]: Move ephemeralpg to inputs. > > [...] > >> (lambda (file) >> + (simple-format (current-error-port) >> + "wrapping: ~A\n" >> + (string-append bin "/" file)) >> (wrap-program (string-append bin "/" file) >> `("PATH" ":" prefix >> - (,bin)) >> + (,bin ,(getenv "PATH"))) > > If I=E2=80=99m not mistaken, this would keep references to GCC, etc. > > What about explicitly listing the things that you list above? Indeed, I've sent another patch which explicitly lists some inputs. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl59HmVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XdHZBAAjPeovoyaz5bzLJJFd8Anv0N34aJKTY/4TUjz9/N8P8Ysu7tEY4h6VZJb +W3b+ZHpCa8vxF+lQ71uQzYxw47oojGAJQXJFC+Zj8ug0a1lHnTNfmoaeqbJ9Otj wXk3BjPTiOoA+DCUufEpcKPNxDtUbkiBSBPjIXzbRsd9kqxiH4Dqq6QZWHyU+Anh 8bRMrHx2bx3ZEaVekAN9HGSmVJwmjMUGOPMKoQgW6rOA4N8PVmfbfAKhr8J0NQzW mVw+J8xBTK8SUbsTozXn4mXsaJRu425szVWSNT4WbJ2/m++89LVh0fTXnI9lgs6k kaWIXHYz06TYdRv1ZkYWCzQdtDo4cw2tkLxJqitxJGXj2ZAYdV+W0VlPSBLtKOMe Ej93qt4HmWlStV53Z1b033Ul64SjGrLBKf+BfsrikROyuz7sEQsG1Yt8/oAowgcP WzGLdHafvLh5cO2zxcGoyHIqtjHbVkPGaEYn/ACTVJ/8UIfgaHMmtJ5sZLvsfvqy fWLFDQQ23HvT08S/LPcRPp3nrUeQdAgAcs1pFcRtxs9oc7WM8BwQz8PUdXxPV5c+ huVITMdCLsa4bCaEWLY/wsDHG1I969T0WGrM78qmtmdUTpXD7BPfdhiyar7aGcP4 sPMHihCEYRYxKKuEbLNAq3kpibJuoL8xXXk1zpEuoBg1Ydo9dXk= =yN15 -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Aug 17 01:51:37 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40162] [PATCH] gnu: guix-data-service: Update to 0.0.1-19.d12909d. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Mar 2020 21:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40162 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: 40162@debbugs.gnu.org Received: via spool by 40162-submit@debbugs.gnu.org id=B40162.15852584217974 (code B ref 40162); Thu, 26 Mar 2020 21:34:01 +0000 Received: (at 40162) by debbugs.gnu.org; 26 Mar 2020 21:33:41 +0000 Received: from localhost ([127.0.0.1]:60283 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jHa8D-00024Y-1W for submit@debbugs.gnu.org; Thu, 26 Mar 2020 17:33:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jHa8B-00024G-Ds for 40162@debbugs.gnu.org; Thu, 26 Mar 2020 17:33:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jHa81-00062t-1X; Thu, 26 Mar 2020 17:33:29 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=38066 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jHa80-0005vI-Ff; Thu, 26 Mar 2020 17:33:28 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200321092259.2729-1-mail@cbaines.net> <20200326212640.10610-1-mail@cbaines.net> Date: Thu, 26 Mar 2020 22:33:25 +0100 In-Reply-To: <20200326212640.10610-1-mail@cbaines.net> (Christopher Baines's message of "Thu, 26 Mar 2020 21:26:40 +0000") Message-ID: <87mu8294yi.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -0.7 (/) 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 (-) Christopher Baines skribis: > These changes support the guix-data-service-backup-database and > guix-data-service-create-small-backup scripts. These are shell scripts, so > require coreutils from the build environment at runtime as well as binaries > from postgresql, ephemeralpg and optionally util-linux (for ionice and > renice). > > * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-19.d12909d. > [arguments]: Add (ice-9 ftw) and (ice-9 match) to #:modules, change the > 'install phase to wrap all bin files with some inputs as well. > [inputs]: Add util-linux and include ephemeralpg from native-inputs. > [native-inputs]: Move ephemeralpg to inputs. LGTM, thanks! Ludo'. From unknown Sun Aug 17 01:51:37 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Christopher Baines Subject: bug#40162: closed (Re: [bug#40162] [PATCH] gnu: guix-data-service: Update to 0.0.1-19.d12909d.) Message-ID: References: <87sghuk9rw.fsf@cbaines.net> <20200321092259.2729-1-mail@cbaines.net> X-Gnu-PR-Message: they-closed 40162 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 40162@debbugs.gnu.org Date: Thu, 26 Mar 2020 22:54:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1585263242-16308-1" This is a multi-part message in MIME format... ------------=_1585263242-16308-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #40162: [PATCH] gnu: guix-data-service: Update to 0.0.1-19.d12909d. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 40162@debbugs.gnu.org. --=20 40162: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D40162 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1585263242-16308-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 40162-done) by debbugs.gnu.org; 26 Mar 2020 22:54:01 +0000 Received: from localhost ([127.0.0.1]:60334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jHbNx-0004Ep-Eo for submit@debbugs.gnu.org; Thu, 26 Mar 2020 18:54:01 -0400 Received: from mira.cbaines.net ([212.71.252.8]:52522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jHbNv-0004Ea-62 for 40162-done@debbugs.gnu.org; Thu, 26 Mar 2020 18:54:00 -0400 Received: from localhost (unknown [46.237.161.230]) by mira.cbaines.net (Postfix) with ESMTPSA id EBB8F27BBE4; Thu, 26 Mar 2020 22:53:57 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 9c279513; Thu, 26 Mar 2020 22:53:55 +0000 (UTC) References: <20200321092259.2729-1-mail@cbaines.net> <20200326212640.10610-1-mail@cbaines.net> <87mu8294yi.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#40162] [PATCH] gnu: guix-data-service: Update to 0.0.1-19.d12909d. In-reply-to: <87mu8294yi.fsf@gnu.org> Date: Thu, 26 Mar 2020 22:53:55 +0000 Message-ID: <87sghuk9rw.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: 40162-done Cc: 40162-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: > Christopher Baines skribis: > >> These changes support the guix-data-service-backup-database and >> guix-data-service-create-small-backup scripts. These are shell scripts, = so >> require coreutils from the build environment at runtime as well as binar= ies >> from postgresql, ephemeralpg and optionally util-linux (for ionice and >> renice). >> >> * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-19.d12909d. >> [arguments]: Add (ice-9 ftw) and (ice-9 match) to #:modules, change the >> 'install phase to wrap all bin files with some inputs as well. >> [inputs]: Add util-linux and include ephemeralpg from native-inputs. >> [native-inputs]: Move ephemeralpg to inputs. > > LGTM, thanks! Great, I've pushed this now :) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl59MoNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xeo8w/6Aih0RtxrZul94+shkCh6W8JgjR7cVtg1D3EhiHE45UhsnSIfA9+9RsGx dDPkT3GOsgiFtWWgnpZMcTHeeC1PWH6VH6OWNmjlpTUy2+bEmLED8ZhgaVBSQHJN DbfXCLXOn2dhh0UP6yUvO3xKHY2zIH3+7lLK3weHKPuAjJ4r5th1b0uqAGSXYvVK qlK8h31D5Y1bobRq5BOH8PMo78yCoZ3qxFIKbZbbyw8t3iv8YEEbInHfL91V8muA egW/wOPD0/QCLCO5AqIbsIzuS3ywCzalCzg30vXHMoBm6fJ/HUsbSG1c1nVHFNA8 rFLBe8zW7Kz9D0MOSqcbauERAsdcLPWL8APygRHcoGjz79Q/bymdG0qNwUCIi8fV Pa4yOoD9TqB6XOZe2hMPdocD/ct98hQYTjGOOTDXhHZhIZ4h7b39fG22wmt1HsEA PDW35S1sqWGxiSzbKUTmoiP8AybRVqCT1DljaurGLu/d0oMxXTrkPMo0bPQtVz7M L/ymIj+A3EJEC/oM0Z8xTdmckRXchal4FvquVkySls4VkW/CjNGkqNMzkcBJ1L/6 1QRIxHe4ig0QlNxv2l1YgEHI4ikvRKC1fwQ7UhJrZJcE1NSu7C1CYUI0jUddYyeM NDJ/yyTtAWF9HxTLOiRHj24vfRGeMmaqQVffHLQed2IwZjTLUHw= =Dy+V -----END PGP SIGNATURE----- --=-=-=-- ------------=_1585263242-16308-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 21 Mar 2020 09:23:08 +0000 Received: from localhost ([127.0.0.1]:45942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jFaLU-0006N7-CT for submit@debbugs.gnu.org; Sat, 21 Mar 2020 05:23:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:46727) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jFaLS-0006Mz-AR for submit@debbugs.gnu.org; Sat, 21 Mar 2020 05:23:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48829) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFaLR-0004rL-49 for guix-patches@gnu.org; Sat, 21 Mar 2020 05:23:06 -0400 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 1jFaLP-0007iS-UX for guix-patches@gnu.org; Sat, 21 Mar 2020 05:23:04 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42898) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jFaLP-0007hr-PE for guix-patches@gnu.org; Sat, 21 Mar 2020 05:23:03 -0400 Received: from localhost (unknown [46.237.162.18]) by mira.cbaines.net (Postfix) with ESMTPSA id 232A427BBE4 for ; Sat, 21 Mar 2020 09:23:02 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 7b30d458 for ; Sat, 21 Mar 2020 09:22:59 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] gnu: guix-data-service: Update to 0.0.1-19.d12909d. Date: Sat, 21 Mar 2020 09:22:59 +0000 Message-Id: <20200321092259.2729-1-mail@cbaines.net> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.71.252.8 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 (/) These changes support the guix-data-service-backup-database and guix-data-service-create-small-backup scripts. These are shell scripts, s= o require coreutils from the build environment at runtime as well as binari= es from postgresql, ephemeralpg and optionally util-linux (for ionice and renice). * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-19.d12909d. [arguments]: Add (ice-9 ftw) and (ice-9 match) to #:modules, change the 'install phase to wrap all bin files with the PATH at build time. [inputs]: Add util-linux and include ephemeralpg from native-inputs. [native-inputs]: Move ephemeralpg to inputs. --- gnu/packages/web.scm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 10cbf6165b..3bcc067b4c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4381,8 +4381,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (package-with-python2 python-feedparser)) =20 (define-public guix-data-service - (let ((commit "18eb9dfdcb3174bfd4bab5b9089acffa13aa1214") - (revision "18")) + (let ((commit "d12909d57282babfc55f1eef96bc478c17821c85") + (revision "19")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit = 7))) @@ -4394,11 +4394,13 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (file-name (git-file-name name version)) (sha256 (base32 - "0lb78cqzqaz0r4sspg272w2a3yhzhqah30j0kxf0z182b0qpmp37"= )))) + "1zh6awrs2qgkrrz4d9212an1ggspmsadjdysgf215z5zkc25lpf7"= )))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) (guix build gnu-build-system) + (ice-9 ftw) + (ice-9 match) (ice-9 rdelim) (ice-9 popen)) #:test-target "check-with-tmp-database" @@ -4426,20 +4428,20 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") "/site-ccache"))) (for-each (lambda (file) + (simple-format (current-error-port) + "wrapping: ~A\n" + (string-append bin "/" file)) (wrap-program (string-append bin "/" file) `("PATH" ":" prefix - (,bin)) + (,bin ,(getenv "PATH"))) `("GUILE_LOAD_PATH" ":" prefix (,scm ,(getenv "GUILE_LOAD_PATH"))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))) - '("guix-data-service" - "guix-data-service-process-branch-updated-email" - "guix-data-service-process-branch-updated-mbox" - "guix-data-service-process-job" - "guix-data-service-process-jobs" - "guix-data-service-manage-build-servers" - "guix-data-service-query-build-servers")) + (scandir bin + (match-lambda + ((or "." "..") #f) + (_ #t)))) #t))) (delete 'strip)))) ; As the .go files aren't compat= ible (inputs @@ -4448,13 +4450,14 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") ("guile-json" ,guile3.0-json) ("guile-email" ,guile3.0-email) ("guile-squee" ,guile3.0-squee) + ("ephemeralpg" ,ephemeralpg) + ("util-linux" ,util-linux) ("postgresql" ,postgresql) ("sqitch" ,sqitch))) (native-inputs `(("guile" ,guile-3.0) ("autoconf" ,autoconf) ("automake" ,automake) - ("ephemeralpg" ,ephemeralpg) ("emacs-minimal" ,emacs-minimal) ("emacs-htmlize" ,emacs-htmlize) ("pkg-config" ,pkg-config))) --=20 2.25.1 ------------=_1585263242-16308-1--