me/guix
Archived
1
0
Fork 0
Code Activity

gnu: multitail: Update to 6.5.2.

Browse source 
* gnu/packages/logging.scm (multitail): Update to 6.5.2.
[arguments]: Don't explicitly return #t from phases.
[source]: Use GIT-FETCH and GIT-FILE-NAME.
[arguments]: Add SYSCONFDIR to #:make-flags.
Add a new 'fix-broken-build phase.
Sanitise the old 'patch-curses-lib phase to 'patch-curses-headers.
This commit is contained in:
Tobias Geerinckx-Rice 2022-06-05 02:00:01 +02:00
parent 2119577052
commit d080adc416
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gnu/packages/logging.scm
View file

@ -164,29 +164,40 @@ commands, displaying the results via a web interface.")
(define-public multitail (define-public multitail
(package (package
(name "multitail") (name "multitail")
(version "6.5.0") (version "6.5.2")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://vanheusden.com/multitail/multitail-" (uri (git-reference
version ".tgz")) (url "https://github.com/halturin/multitail")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "1vd9vdxyxsccl64ilx542ya5vlw2bpg6gnkq1x8cfqy6vxvmx7dj")))) (base32 "17hg5qpangyx4m7hp2x4h56mp6w3wsaslg1il39qcpwsffh1rihc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
(list (string-append "CC=" ,(cc-for-target)) (list (string-append "CC=" ,(cc-for-target))
(string-append "PREFIX=" (string-append "PREFIX=" (assoc-ref %outputs "out"))
(assoc-ref %outputs "out"))) "SYSCONFDIR=$(PREFIX)/etc")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-curses-lib (add-after 'unpack 'fix-broken-build
(lambda* (#:key outputs #:allow-other-keys) ;; With some luck, you might be able to remove this when updating…
(let ((out (assoc-ref outputs "out"))) (lambda _
(substitute* "Makefile"
((" \\*\\.txt") "")
((".*CONFIG_DIR.*") "")
(("^install: .*" match)
(string-append match
"\t$(INSTALL_DIR) $(DESTDIR)$(SYSCONFDIR)\n")))
(substitute* "version"
(("(VERSION=).*" _ assign)
(string-append assign ,version)))))
(add-after 'unpack 'patch-curses-headers
(lambda _
(substitute* "mt.h" (substitute* "mt.h"
(("ncursesw\\/panel.h") "panel.h") (("ncursesw/") ""))))
(("ncursesw\\/ncurses.h") "ncurses.h")))
#t))
(delete 'configure)) ; no configure script (delete 'configure)) ; no configure script
#:tests? #f)) ; no test suite (make check just runs cppcheck) #:tests? #f)) ; no test suite (make check just runs cppcheck)
(inputs (list ncurses)) (inputs (list ncurses))