* bug#26770: [PATCH] gnu: tailon: Add missing inputs.
@ 2017-05-04 6:47 Christopher Baines
2017-05-05 16:33 ` Marius Bakke
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Christopher Baines @ 2017-05-04 6:47 UTC (permalink / raw)
To: 26770
* gnu/packages/logging.scm (tailon)[inputs]: Add grep, gawk, sed and coreutils
as inputs.
[arguments]: Wrap bin/tailon to include some inputs in the PATH.
---
gnu/packages/logging.scm | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index 2523d65f6..060521eab 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -26,6 +26,8 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (gnu packages)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages gawk)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
#:use-module (gnu packages autotools))
@@ -108,7 +110,25 @@ command line.")
(inputs
`(("python-pyyaml" ,python-pyyaml)
("python-sockjs-tornado" ,python-sockjs-tornado)
- ("python-tornado" ,python-tornado)))
+ ("python-tornado" ,python-tornado)
+ ("grep" ,grep)
+ ("gawk" ,gawk)
+ ("sed" ,sed)
+ ("tail" ,coreutils)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-tailon-path
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/tailon")
+ `("PATH" ":" prefix ,(map
+ (lambda (input)
+ (string-append
+ (assoc-ref inputs input)
+ "/bin"))
+ '("grep" "gawk" "sed" "tail"))))
+ #t))))))
(home-page "https://tailon.readthedocs.io/")
(synopsis
"Webapp for looking at and searching through log files")
--
2.12.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* bug#26770: [PATCH] gnu: tailon: Add missing inputs.
2017-05-04 6:47 bug#26770: [PATCH] gnu: tailon: Add missing inputs Christopher Baines
@ 2017-05-05 16:33 ` Marius Bakke
2017-05-15 6:25 ` Christopher Baines
2017-05-15 6:11 ` bug#26770: [PATCH] gnu: tailon: Use absolute paths for commands Christopher Baines
2017-05-16 19:40 ` Christopher Baines
2 siblings, 1 reply; 9+ messages in thread
From: Marius Bakke @ 2017-05-05 16:33 UTC (permalink / raw)
To: Christopher Baines, 26770
[-- Attachment #1: Type: text/plain, Size: 517 bytes --]
Christopher Baines <mail@cbaines.net> writes:
> * gnu/packages/logging.scm (tailon)[inputs]: Add grep, gawk, sed and coreutils
> as inputs.
> [arguments]: Wrap bin/tailon to include some inputs in the PATH.
Generally it's better to fully qualify the paths to these programs in
the code. Is that difficult here?
I think all of these inputs are already available, so you can do e.g.:
(substitute "foo"
(("'grep'") (which "grep))
(("'gawk'") (which "gawk")))
...instead of referencing the inputs explicitly.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* bug#26770: [PATCH] gnu: tailon: Use absolute paths for commands.
2017-05-04 6:47 bug#26770: [PATCH] gnu: tailon: Add missing inputs Christopher Baines
2017-05-05 16:33 ` Marius Bakke
@ 2017-05-15 6:11 ` Christopher Baines
2017-05-15 15:59 ` Marius Bakke
2017-05-16 19:40 ` Christopher Baines
2 siblings, 1 reply; 9+ messages in thread
From: Christopher Baines @ 2017-05-15 6:11 UTC (permalink / raw)
To: 26770
* gnu/packages/logging.scm (tailon)[arguments]: Patch commands.py to reference
grep, awk, sed and tail by absolute paths.
---
gnu/packages/logging.scm | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index 2523d65f6..11bbfef52 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -109,6 +109,22 @@ command line.")
`(("python-pyyaml" ,python-pyyaml)
("python-sockjs-tornado" ,python-sockjs-tornado)
("python-tornado" ,python-tornado)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-tailon-path
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* (find-files out "commands.py")
+ (("self\\.first_in_path\\('grep'\\)")
+ (string-append"'" (which "grep") "'"))
+ (("self\\.first_in_path\\('gawk', 'awk'\\)")
+ (string-append"'" (which "gawk") "'"))
+ (("self\\.first_in_path\\('gsed', 'sed'\\)")
+ (string-append"'" (which "sed") "'"))
+ (("self\\.first_in_path\\('gtail', 'tail'\\)")
+ (string-append"'" (which "tail") "'")))
+ #t))))))
(home-page "https://tailon.readthedocs.io/")
(synopsis
"Webapp for looking at and searching through log files")
--
2.12.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* bug#26770: [PATCH] gnu: tailon: Use absolute paths for commands.
2017-05-15 6:11 ` bug#26770: [PATCH] gnu: tailon: Use absolute paths for commands Christopher Baines
@ 2017-05-15 15:59 ` Marius Bakke
2017-05-16 19:49 ` Christopher Baines
0 siblings, 1 reply; 9+ messages in thread
From: Marius Bakke @ 2017-05-15 15:59 UTC (permalink / raw)
To: Christopher Baines, 26770
[-- Attachment #1: Type: text/plain, Size: 1303 bytes --]
Christopher Baines <mail@cbaines.net> writes:
> * gnu/packages/logging.scm (tailon)[arguments]: Patch commands.py to reference
> grep, awk, sed and tail by absolute paths.
Thanks for this!
[...]
> + (add-after 'install 'wrap-tailon-path
> + (lambda* (#:key inputs outputs #:allow-other-keys)
> + (let ((out (assoc-ref outputs "out")))
> + (substitute* (find-files out "commands.py")
> + (("self\\.first_in_path\\('grep'\\)")
> + (string-append"'" (which "grep") "'"))
> + (("self\\.first_in_path\\('gawk', 'awk'\\)")
> + (string-append"'" (which "gawk") "'"))
> + (("self\\.first_in_path\\('gsed', 'sed'\\)")
> + (string-append"'" (which "sed") "'"))
> + (("self\\.first_in_path\\('gtail', 'tail'\\)")
> + (string-append"'" (which "tail") "'")))
> + #t))))))
Is there any particular reason this phase runs after 'install'? I think
we should try to avoid modifying files after they have been copied to
the store, but if doing this substitution earlier is difficult I guess
it's okay with a comment.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* bug#26770: [PATCH] gnu: tailon: Use absolute paths for commands.
2017-05-15 15:59 ` Marius Bakke
@ 2017-05-16 19:49 ` Christopher Baines
2017-05-17 14:53 ` Marius Bakke
0 siblings, 1 reply; 9+ messages in thread
From: Christopher Baines @ 2017-05-16 19:49 UTC (permalink / raw)
To: Marius Bakke; +Cc: 26770
[-- Attachment #1: Type: text/plain, Size: 1481 bytes --]
On Mon, 15 May 2017 17:59:42 +0200
Marius Bakke <mbakke@fastmail.com> wrote:
> Christopher Baines <mail@cbaines.net> writes:
> > + (add-after 'install 'wrap-tailon-path
> > + (lambda* (#:key inputs outputs
> > #:allow-other-keys)
> > + (let ((out (assoc-ref outputs "out")))
> > + (substitute* (find-files out "commands.py")
> > + (("self\\.first_in_path\\('grep'\\)")
> > + (string-append"'" (which "grep") "'"))
> > + (("self\\.first_in_path\\('gawk',
> > 'awk'\\)")
> > + (string-append"'" (which "gawk") "'"))
> > + (("self\\.first_in_path\\('gsed',
> > 'sed'\\)")
> > + (string-append"'" (which "sed") "'"))
> > + (("self\\.first_in_path\\('gtail',
> > 'tail'\\)")
> > + (string-append"'" (which "tail") "'")))
> > + #t))))))
>
> Is there any particular reason this phase runs after 'install'? I
> think we should try to avoid modifying files after they have been
> copied to the store, but if doing this substitution earlier is
> difficult I guess it's okay with a comment.
No, I just put it there by default, but I can see why doing the
substitution earlier would be better. I've sent another patch that
moves it to after the unpack phase.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 963 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* bug#26770: [PATCH] gnu: tailon: Use absolute paths for commands.
2017-05-16 19:49 ` Christopher Baines
@ 2017-05-17 14:53 ` Marius Bakke
2017-05-18 18:50 ` Christopher Baines
0 siblings, 1 reply; 9+ messages in thread
From: Marius Bakke @ 2017-05-17 14:53 UTC (permalink / raw)
To: Christopher Baines; +Cc: 26770-done
[-- Attachment #1: Type: text/plain, Size: 1820 bytes --]
Christopher Baines <mail@cbaines.net> writes:
> On Mon, 15 May 2017 17:59:42 +0200
> Marius Bakke <mbakke@fastmail.com> wrote:
>
>> Christopher Baines <mail@cbaines.net> writes:
>> > + (add-after 'install 'wrap-tailon-path
>> > + (lambda* (#:key inputs outputs
>> > #:allow-other-keys)
>> > + (let ((out (assoc-ref outputs "out")))
>> > + (substitute* (find-files out "commands.py")
>> > + (("self\\.first_in_path\\('grep'\\)")
>> > + (string-append"'" (which "grep") "'"))
>> > + (("self\\.first_in_path\\('gawk',
>> > 'awk'\\)")
>> > + (string-append"'" (which "gawk") "'"))
>> > + (("self\\.first_in_path\\('gsed',
>> > 'sed'\\)")
>> > + (string-append"'" (which "sed") "'"))
>> > + (("self\\.first_in_path\\('gtail',
>> > 'tail'\\)")
>> > + (string-append"'" (which "tail") "'")))
>> > + #t))))))
>>
>> Is there any particular reason this phase runs after 'install'? I
>> think we should try to avoid modifying files after they have been
>> copied to the store, but if doing this substitution earlier is
>> difficult I guess it's okay with a comment.
>
> No, I just put it there by default, but I can see why doing the
> substitution earlier would be better. I've sent another patch that
> moves it to after the unpack phase.
Applied, thank you! My rationale was that the store may be on slow
storage (say NFS), whereas the build directory is probably a tmpfs
or local storage.
Note: I replaced the "find-files" invocation with just the one file
path. Hope that was okay!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* bug#26770: [PATCH] gnu: tailon: Use absolute paths for commands.
2017-05-17 14:53 ` Marius Bakke
@ 2017-05-18 18:50 ` Christopher Baines
0 siblings, 0 replies; 9+ messages in thread
From: Christopher Baines @ 2017-05-18 18:50 UTC (permalink / raw)
To: Marius Bakke; +Cc: 26770-done
[-- Attachment #1.1: Type: text/plain, Size: 1940 bytes --]
On 17/05/17 15:53, Marius Bakke wrote:
> Christopher Baines <mail@cbaines.net> writes:
>
>> On Mon, 15 May 2017 17:59:42 +0200
>> Marius Bakke <mbakke@fastmail.com> wrote:
>>
>>> Christopher Baines <mail@cbaines.net> writes:
>>>> + (add-after 'install 'wrap-tailon-path
>>>> + (lambda* (#:key inputs outputs
>>>> #:allow-other-keys)
>>>> + (let ((out (assoc-ref outputs "out")))
>>>> + (substitute* (find-files out "commands.py")
>>>> + (("self\\.first_in_path\\('grep'\\)")
>>>> + (string-append"'" (which "grep") "'"))
>>>> + (("self\\.first_in_path\\('gawk',
>>>> 'awk'\\)")
>>>> + (string-append"'" (which "gawk") "'"))
>>>> + (("self\\.first_in_path\\('gsed',
>>>> 'sed'\\)")
>>>> + (string-append"'" (which "sed") "'"))
>>>> + (("self\\.first_in_path\\('gtail',
>>>> 'tail'\\)")
>>>> + (string-append"'" (which "tail") "'")))
>>>> + #t))))))
>>>
>>> Is there any particular reason this phase runs after 'install'? I
>>> think we should try to avoid modifying files after they have been
>>> copied to the store, but if doing this substitution earlier is
>>> difficult I guess it's okay with a comment.
>>
>> No, I just put it there by default, but I can see why doing the
>> substitution earlier would be better. I've sent another patch that
>> moves it to after the unpack phase.
>
> Applied, thank you! My rationale was that the store may be on slow
> storage (say NFS), whereas the build directory is probably a tmpfs
> or local storage.
>
> Note: I replaced the "find-files" invocation with just the one file
> path. Hope that was okay!
Yep, looks good. Thanks for your review :)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 858 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#26770: [PATCH] gnu: tailon: Use absolute paths for commands.
2017-05-04 6:47 bug#26770: [PATCH] gnu: tailon: Add missing inputs Christopher Baines
2017-05-05 16:33 ` Marius Bakke
2017-05-15 6:11 ` bug#26770: [PATCH] gnu: tailon: Use absolute paths for commands Christopher Baines
@ 2017-05-16 19:40 ` Christopher Baines
2 siblings, 0 replies; 9+ messages in thread
From: Christopher Baines @ 2017-05-16 19:40 UTC (permalink / raw)
To: 26770
* gnu/packages/logging.scm (tailon)[arguments]: Patch commands.py to reference
grep, awk, sed and tail by absolute paths.
---
gnu/packages/logging.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index 2523d65f6..203279f33 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -109,6 +109,21 @@ command line.")
`(("python-pyyaml" ,python-pyyaml)
("python-sockjs-tornado" ,python-sockjs-tornado)
("python-tornado" ,python-tornado)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-commands.py
+ (lambda args
+ (substitute* (find-files "." "commands\\.py")
+ (("self\\.first_in_path\\('grep'\\)")
+ (string-append"'" (which "grep") "'"))
+ (("self\\.first_in_path\\('gawk', 'awk'\\)")
+ (string-append"'" (which "gawk") "'"))
+ (("self\\.first_in_path\\('gsed', 'sed'\\)")
+ (string-append"'" (which "sed") "'"))
+ (("self\\.first_in_path\\('gtail', 'tail'\\)")
+ (string-append"'" (which "tail") "'")))
+ #t)))))
(home-page "https://tailon.readthedocs.io/")
(synopsis
"Webapp for looking at and searching through log files")
--
2.12.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-05-18 18:51 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-04 6:47 bug#26770: [PATCH] gnu: tailon: Add missing inputs Christopher Baines
2017-05-05 16:33 ` Marius Bakke
2017-05-15 6:25 ` Christopher Baines
2017-05-15 6:11 ` bug#26770: [PATCH] gnu: tailon: Use absolute paths for commands Christopher Baines
2017-05-15 15:59 ` Marius Bakke
2017-05-16 19:49 ` Christopher Baines
2017-05-17 14:53 ` Marius Bakke
2017-05-18 18:50 ` Christopher Baines
2017-05-16 19:40 ` Christopher Baines
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).