From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dE0QS-0005vo-0M for guix-patches@gnu.org; Thu, 25 May 2017 17:36:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dE0QN-0004pH-Pr for guix-patches@gnu.org; Thu, 25 May 2017 17:36:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:35588) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dE0QN-0004p6-F5 for guix-patches@gnu.org; Thu, 25 May 2017 17:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dE0QL-0004XR-Po for guix-patches@gnu.org; Thu, 25 May 2017 17:36:03 -0400 Subject: bug#27075: [PATCH] gnu: Add multitail Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dE0Pn-0005tX-I0 for guix-patches@gnu.org; Thu, 25 May 2017 17:35:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dE0Pj-0004O9-Ef for guix-patches@gnu.org; Thu, 25 May 2017 17:35:27 -0400 Received: from dd5424.kasserver.com ([85.13.138.252]:60903) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dE0Pj-0004Nf-3y for guix-patches@gnu.org; Thu, 25 May 2017 17:35:23 -0400 Received: from localhost (194-166-36-58.hdsl.highway.telekom.at [194.166.36.58]) by dd5424.kasserver.com (Postfix) with ESMTPA id F1E11B5800F0 for ; Thu, 25 May 2017 23:35:20 +0200 (CEST) From: Stefan =?UTF-8?Q?Reich=C3=B6r?= In-Reply-To: <87a860vdv3.fsf@fastmail.com> (Marius Bakke's message of "Thu, 25 May 2017 23:13:52 +0200") References: <87efvc3cbe.fsf@xsteve.at> <87a860vdv3.fsf@fastmail.com> Date: Thu, 25 May 2017 23:35:20 +0200 Message-ID: <87a86039if.fsf@xsteve.at> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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: 27075@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Marius Bakke writes: Thanks for your review! > Stefan Reich=C3=B6r 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 cppch= eck) > > 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 mu= ltiple >> +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/LI= CENSE) 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: --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-multitail.patch Content-Transfer-Encoding: quoted-printable >From 7e98231dbe260b4345fe182cf320aa2bb1f060dd Mon Sep 17 00:00:00 2001 From: Stefan Reichoer 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 =C2=A9 2016 Ricardo Wurmus ;;; Copyright =C2=A9 2016, 2017 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2017 Stefan Reich=C3=B6r ;;; ;;; 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=3Dgcc" + "PREFIX=3D" + (string-append "DESTDIR=3D" + (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 multi= ple +windows in a terminal, colorize, filter and merge.") + (license license:gpl2+))) --=20 2.7.4 --=-=-=--