bug#27075: [PATCH] gnu: Add multitail

bug#27075: [PATCH] gnu: Add multitail

[Stefan Reichör]

[-- Attachment #1: Type: text/plain, Size: 110 bytes --]

Hi there,

I am not sure what category fits best for multitail. I have added it to
less as a first attempt.



[-- Attachment #2: 0001-gnu-Add-multitail.patch --]
[-- Type: text/x-diff, Size: 2423 bytes --]

From 14ddddd847c1460eca4e1640ada843a6ffff6f55 Mon Sep 17 00:00:00 2001
From: Stefan Reichoer <stefan@xsteve.at>
Date: Thu, 25 May 2017 22:30:41 +0200
Subject: [PATCH] gnu: Add multitail.

* gnu/packages/less.scm (multitail): New variable.
---
 gnu/packages/less.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm
index 0aa4665..ed16c99 100644
--- a/gnu/packages/less.scm
+++ b/gnu/packages/less.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
+;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -46,3 +47,41 @@ backwards and forwards movement through the document.  It also does not have
 to read the entire input file before starting, so it starts faster than most
 text editors.")
     (license gpl3+))) ; some files are under GPLv2+
+
+(define-public multitail
+  (package
+    (name "multitail")
+    (version "6.4.2")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "https://vanheusden.com/multitail/multitail-"
+                          version ".tgz"))
+      (sha256
+       (base32
+        "1zd1r89xkxngl1pdrvsc877838nwkfqkbcgfqm3vglwalxc587dg"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:make-flags
+       (list "CC=gcc"
+             "PREFIX="
+             (string-append "DESTDIR="
+                            (assoc-ref %outputs "out")))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-curses-lib
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (substitute* "mt.h"
+                 (("ncursesw\\/panel.h") "panel.h")
+                 (("ncursesw\\/ncurses.h") "ncurses.h")))
+             #t))
+         (delete 'configure)
+         (delete 'check)))) ; no test suite (make check just runs cppcheck)
+    (inputs `(("ncurses" ,ncurses)))
+    (home-page "https://vanheusden.com/multitail/")
+    (synopsis "Monitor multiple logfiles")
+    (description
+     "MultiTail allows you to monitor logfiles and command output in multiple
+windows in a terminal, colorize, filter and merge.")
+    (license gpl2)))
-- 
2.7.4

bug#27075: [PATCH] gnu: Add multitail

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1373 bytes --]

Stefan Reichör <stefan@xsteve.at> writes:

> Hi there,
>
> I am not sure what category fits best for multitail. I have added it to
> less as a first attempt.

Thanks for this! I think "logging.scm" works well for this package. A
few comments:

> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'patch-curses-lib
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let ((out (assoc-ref outputs "out")))
> +               (substitute* "mt.h"
> +                 (("ncursesw\\/panel.h") "panel.h")
> +                 (("ncursesw\\/ncurses.h") "ncurses.h")))
> +             #t))
> +         (delete 'configure)
> +         (delete 'check)))) ; no test suite (make check just runs cppcheck)

Instead of deleting the 'check' phase, you can set the #:tests? keyword
to #f.

> +    (inputs `(("ncurses" ,ncurses)))
> +    (home-page "https://vanheusden.com/multitail/")
> +    (synopsis "Monitor multiple logfiles")
> +    (description
> +     "MultiTail allows you to monitor logfiles and command output in multiple
> +windows in a terminal, colorize, filter and merge.")
> +    (license gpl2)))

When there is no version information indicated in the source code
headers, we default to "or later" (i.e. gpl2+ in this instance).

The rest LGTM. Can you send an updated patch?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#27075: [PATCH] gnu: Add multitail

[Stefan Reichör]

[-- Attachment #1: Type: text/plain, Size: 1673 bytes --]

Marius Bakke <mbakke@fastmail.com> writes:

Thanks for your review!

> Stefan Reichör <stefan@xsteve.at> writes:
>
>> Hi there,
>>
>> I am not sure what category fits best for multitail. I have added it to
>> less as a first attempt.
>
> Thanks for this! I think "logging.scm" works well for this package. A
> few comments:

o.k.

>> +       #:phases
>> +       (modify-phases %standard-phases
>> +         (add-after 'unpack 'patch-curses-lib
>> +           (lambda* (#:key outputs #:allow-other-keys)
>> +             (let ((out (assoc-ref outputs "out")))
>> +               (substitute* "mt.h"
>> +                 (("ncursesw\\/panel.h") "panel.h")
>> +                 (("ncursesw\\/ncurses.h") "ncurses.h")))
>> +             #t))
>> +         (delete 'configure)
>> +         (delete 'check)))) ; no test suite (make check just runs cppcheck)
>
> Instead of deleting the 'check' phase, you can set the #:tests? keyword
> to #f.
>
>> +    (inputs `(("ncurses" ,ncurses)))
>> +    (home-page "https://vanheusden.com/multitail/")
>> +    (synopsis "Monitor multiple logfiles")
>> +    (description
>> +     "MultiTail allows you to monitor logfiles and command output in multiple
>> +windows in a terminal, colorize, filter and merge.")
>> +    (license gpl2)))
>
> When there is no version information indicated in the source code
> headers, we default to "or later" (i.e. gpl2+ in this instance).

I read the LICENSE file (https://github.com/flok99/multitail/blob/master/LICENSE) and thought it is gpl2.
But I updated it to gpl2+ now.

>
> The rest LGTM. Can you send an updated patch?

Here is the updated patch:


[-- Attachment #2: 0001-gnu-Add-multitail.patch --]
[-- Type: text/x-diff, Size: 2751 bytes --]

From 7e98231dbe260b4345fe182cf320aa2bb1f060dd Mon Sep 17 00:00:00 2001
From: Stefan Reichoer <stefan@xsteve.at>
Date: Thu, 25 May 2017 23:34:02 +0200
Subject: [PATCH] gnu: Add multitail.

* gnu/packages/logging.scm (multitail): New variable.
---
 gnu/packages/logging.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index b2b0582..eecfe45 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,6 +27,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
+  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
   #:use-module (gnu packages autotools))
@@ -129,3 +131,41 @@ command line.")
      "Tailon provides a web interface around the tail, grep, awk and sed
 commands, displaying the results via a web interface.")
     (license license:bsd-3)))
+
+(define-public multitail
+  (package
+    (name "multitail")
+    (version "6.4.2")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "https://vanheusden.com/multitail/multitail-"
+                          version ".tgz"))
+      (sha256
+       (base32
+        "1zd1r89xkxngl1pdrvsc877838nwkfqkbcgfqm3vglwalxc587dg"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:make-flags
+       (list "CC=gcc"
+             "PREFIX="
+             (string-append "DESTDIR="
+                            (assoc-ref %outputs "out")))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-curses-lib
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (substitute* "mt.h"
+                 (("ncursesw\\/panel.h") "panel.h")
+                 (("ncursesw\\/ncurses.h") "ncurses.h")))
+             #t))
+         (delete 'configure))
+       #:tests? #f)) ; no test suite (make check just runs cppcheck)
+    (inputs `(("ncurses" ,ncurses)))
+    (home-page "https://vanheusden.com/multitail/")
+    (synopsis "Monitor multiple logfiles")
+    (description
+     "MultiTail allows you to monitor logfiles and command output in multiple
+windows in a terminal, colorize, filter and merge.")
+    (license license:gpl2+)))
-- 
2.7.4

bug#27075: [PATCH] gnu: Add multitail

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 361 bytes --]

Stefan Reichör <stefan@xsteve.at> writes:

> Here is the updated patch:
>
> From 7e98231dbe260b4345fe182cf320aa2bb1f060dd Mon Sep 17 00:00:00 2001
> From: Stefan Reichoer <stefan@xsteve.at>
> Date: Thu, 25 May 2017 23:34:02 +0200
> Subject: [PATCH] gnu: Add multitail.
>
> * gnu/packages/logging.scm (multitail): New variable.

Applied, thank you!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]