GNU bug report logs - #34324
[PATCH] gnu: artanis: Make some improvements.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Christopher Baines <mail <at> cbaines.net>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#34324: closed ([PATCH] gnu: artanis: Make some improvements.)
Date: Tue, 05 Feb 2019 09:26:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Tue, 05 Feb 2019 09:25:15 +0000
with message-id <87y36u60zo.fsf <at> cbaines.net>
and subject line Re: [bug#34324] [PATCH] gnu: artanis: Make some improvements.
has caused the debbugs.gnu.org bug report #34324,
regarding [PATCH] gnu: artanis: Make some improvements.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
34324: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=34324
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Christopher Baines <mail <at> cbaines.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: artanis: Make some improvements.
Date: Mon,  4 Feb 2019 23:50:47 +0000

* 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. Wrap
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 @@
 
 (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' executable
                  #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-ccache")))
                  (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 in Guile
-- 
2.20.1

[Message part 3 (message/rfc822, inline)]

From: Christopher Baines <mail <at> cbaines.net>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: 34324-done <at> debbugs.gnu.org
Subject: Re: [bug#34324] [PATCH] gnu: artanis: Make some improvements.
Date: Tue, 05 Feb 2019 09:25:15 +0000

[Message part 4 (text/plain, inline)]

Ricardo Wurmus <rekado <at> elephly.net> writes:

> Christopher Baines <mail <at> cbaines.net> writes:
>
>> * 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. Wrap
>> the art command such that it finds guile-json and guile-redis.
>
> LGTM, thanks!

Great, I've pushed this as
fd9a6d83c280593bd61805a78a9f45ced3e6a527. Thanks for taking a look :)

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.