From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:58953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqo28-0001x1-EI for guix-patches@gnu.org; Mon, 04 Feb 2019 18:52:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqo26-0005e0-Dv for guix-patches@gnu.org; Mon, 04 Feb 2019 18:52:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60629) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gqo1y-0005aX-Mi for guix-patches@gnu.org; Mon, 04 Feb 2019 18:52:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gqo1y-0006A3-EZ for guix-patches@gnu.org; Mon, 04 Feb 2019 18:52:02 -0500 Subject: [bug#34324] [PATCH] gnu: artanis: Make some improvements. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:58763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqo0r-0001tV-7a for guix-patches@gnu.org; Mon, 04 Feb 2019 18:50:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqo0p-0004yZ-ED for guix-patches@gnu.org; Mon, 04 Feb 2019 18:50:53 -0500 Received: from li622-129.members.linode.com ([212.71.249.129]:37290 helo=mira.cbaines.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqo0p-0004xZ-8O for guix-patches@gnu.org; Mon, 04 Feb 2019 18:50:51 -0500 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 7BBA816B7D for ; Mon, 4 Feb 2019 23:50:48 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id d591e201 for ; Mon, 4 Feb 2019 23:50:47 +0000 (UTC) From: Christopher Baines Date: Mon, 4 Feb 2019 23:50:47 +0000 Message-Id: <20190204235047.28301-1-mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34324@debbugs.gnu.org * gnu/packages/guile-xyz.scm (artanis): Remove a tab character by the revision. [arguments]: Patch the site-dir for the help command, to make it work. Wr= ap the art command such that it finds guile-json and guile-redis. --- gnu/packages/guile-xyz.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9640d17c3c..6c1e9c50ec 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -85,7 +85,7 @@ =20 (define-public artanis (let ((release "0.3.1") - (revision 0)) + (revision 0)) (package (name "artanis") (version (if (zero? revision) @@ -152,6 +152,13 @@ #:test-target "test" #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-site-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "artanis/commands/help.scm" + (("\\(%site-dir\\)") + (string-append "\"" + (assoc-ref outputs "out") + "/share/guile/site/2.2\""))))) (add-before 'install 'substitute-root-dir (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -162,14 +169,16 @@ (mkdir-p (string-append out "/bin")) ;for the `art' exe= cutable #t))) (add-after 'install 'wrap-art - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) (scm (string-append out "/share/guile/site/2.2")) (go (string-append out "/lib/guile/2.2/site-ccach= e"))) (wrap-program (string-append bin "/art") - `("GUILE_LOAD_PATH" ":" prefix (,scm)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,go))) + `("GUILE_LOAD_PATH" ":" prefix + (,scm ,(getenv "GUILE_LOAD_PATH"))) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix + (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))) #t)))))) (synopsis "Web application framework written in Guile") (description "GNU Artanis is a web application framework written i= n Guile --=20 2.20.1