From patchwork Thu Mar 26 21:26:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 20898 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B845B27BBE4; Thu, 26 Mar 2020 21:28:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D18D527BBEA for ; Thu, 26 Mar 2020 21:28:18 +0000 (GMT) Received: from localhost ([::1]:60638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHa30-0006ZV-Am for patchwork@mira.cbaines.net; Thu, 26 Mar 2020 17:28:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44665) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHa1p-0005kk-Ey for guix-patches@gnu.org; Thu, 26 Mar 2020 17:27:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHa1n-0007wK-Fz for guix-patches@gnu.org; Thu, 26 Mar 2020 17:27:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54301) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHa1l-0007ux-T4 for guix-patches@gnu.org; Thu, 26 Mar 2020 17:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jHa1l-0001sX-Mv for guix-patches@gnu.org; Thu, 26 Mar 2020 17:27:01 -0400 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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)))