* [bug#45130] [PATCH] gnu: Add mtm.
@ 2020-12-09 1:33 luhux
2021-11-03 14:53 ` phodina via Guix-patches via
0 siblings, 1 reply; 3+ messages in thread
From: luhux @ 2020-12-09 1:33 UTC (permalink / raw)
To: 45130
From 6f1a84e8b4feb3cc3c80095fe2aeec30d7862d9d Mon Sep 17 00:00:00 2001
From: luhux <luhux@outlook.com>
Date: Wed, 9 Dec 2020 00:47:03 +0000
Subject: [PATCH] gnu: Add mtm.
* gnu/packages/suckless.scm (mtm): New variable.
---
gnu/packages/suckless.scm | 61 +++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 7e297eb9ae..00f90a36ff 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2020 luhux <luhux@outlook.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -766,3 +767,63 @@ chat output in the background.")
Single daemon and configuration file. Log to stdout or syslog. No mail
support.")
(license license:expat)))
+
+(define-public mtm
+ (let ((commit "cabd8704b9299d8b354ec8b403a6041bbddd2191")
+ (revision "0"))
+ (package
+ (name "mtm")
+ (version (git-version "1.2.0" revision commit))
+ (source
+ (origin
+ (uri (git-reference
+ (url "https://github.com/deadpixi/mtm")
+ (commit commit)))
+ (method git-fetch)
+ (sha256
+ (base32 "08crai3wxa6npd27y6qd290mj55l0bk8ibm4agyb002kbga8vkc7"))
+ (file-name (git-file-name name version))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("ncurses" ,ncurses)))
+ (arguments
+ `(#:tests? #f ; no tests
+ #:make-flags
+ (list (string-append "CC=" ,(cc-for-target))
+ (string-append "DESTDIR=" (assoc-ref %outputs "out")))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'fix-headers
+ (lambda _
+ (substitute* "config.def.h"
+ (("ncursesw/curses.h")
+ "curses.h"))))
+ (replace 'install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ ;; install binary
+ (mkdir-p (string-append out "bin/"))
+ (install-file "mtm" (string-append out "/bin"))
+ ;; install manpage
+ (mkdir-p (string-append out "share/man/man1"))
+ (install-file "mtm.1" (string-append out "/share/man/man1"))
+ ;; install terminfo
+ (mkdir-p (string-append out "share/terminfo"))
+ (invoke (string-append (assoc-ref inputs "ncurses") "/bin/tic")
+ "-x" "-s" "-o"
+ (string-append
+ out "/share/terminfo")
+ "mtm.ti"))
+ #t))
+ (delete 'configure))))
+ ;; FIXME: This should only be located in 'ncurses'. Nonetheless it is
+ ;; provided for usability reasons. See <https://bugs.gnu.org/22138>.
+ (native-search-paths
+ (list (search-path-specification
+ (variable "TERMINFO_DIRS")
+ (files '("share/terminfo")))))
+ (synopsis "Micro Terminal Multiplexer")
+ (description
+ "Micro Terminal Multiplexer")
+ (license license:gpl3+)
+ (home-page "https://github.com/deadpixi/mtm"))))
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#45130] [PATCH] gnu: Add mtm.
2020-12-09 1:33 [bug#45130] [PATCH] gnu: Add mtm luhux
@ 2021-11-03 14:53 ` phodina via Guix-patches via
2021-11-06 9:33 ` Nicolas Goaziou
0 siblings, 1 reply; 3+ messages in thread
From: phodina via Guix-patches via @ 2021-11-03 14:53 UTC (permalink / raw)
To: 45130@debbugs.gnu.org
Hi,
here's updated version of the patch where the version uses newest tag instead of commit. Otherwise LGTM.
--8<---------------cut here---------------start------------->8---
Subject: [PATCH v2] gnu: Add mtm.
* gnu/packages/suckless.scm (mtm): New variable.
diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index b4855ec0a2..0e21af24e5 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright @ 2020 luhux <luhux@outlook.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;;
@@ -700,6 +701,65 @@ (define-public noice
"Noice is a small curses-based file browser.")
(license license:bsd-2)))
+(define-public mtm
+ (package
+ (name "mtm")
+ (version "1.2.1")
+ (source
+ (origin
+ (uri (git-reference
+ (url "https://github.com/deadpixi/mtm")
+ (commit version)))
+ (method git-fetch)
+ (sha256
+ (base32 "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv"))
+ (file-name (git-file-name name version))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("ncurses" ,ncurses)))
+ (arguments
+ `(#:tests? #f ; no tests
+ #:make-flags
+ (list (string-append "CC=" ,(cc-for-target))
+ (string-append "DESTDIR=" (assoc-ref %outputs "out")))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'fix-headers
+ (lambda _
+ (substitute* "config.def.h"
+ (("ncursesw/curses.h")
+ "curses.h"))))
+ (replace 'install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ ;; install binary
+ (mkdir-p (string-append out "bin/"))
+ (install-file "mtm" (string-append out "/bin"))
+ ;; install manpage
+ (mkdir-p (string-append out "share/man/man1"))
+ (install-file "mtm.1" (string-append out "/share/man/man1"))
+ ;; install terminfo
+ (mkdir-p (string-append out "share/terminfo"))
+ (invoke (string-append (assoc-ref inputs "ncurses") "/bin/tic")
+ "-x" "-s" "-o"
+ (string-append
+ out "/share/terminfo")
+ "mtm.ti"))
+ #t))
+ (delete 'configure))))
+ ;; FIXME: This should only be located in 'ncurses'. Nonetheless it is
+ ;; provided for usability reasons. See <https://bugs.gnu.org/22138>.
+ (native-search-paths
+ (list (search-path-specification
+ (variable "TERMINFO_DIRS")
+ (files '("share/terminfo")))))
+ (synopsis "Micro Terminal Multiplexer")
+ (description
+ "This package provides multiplexer for the terminal focused on simplicity,
+compatibility, size and stability.")
+ (license license:gpl3+)
+ (home-page "https://github.com/deadpixi/mtm")))
+
(define-public human
(package
(name "human")
--
2.33.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#45130] [PATCH] gnu: Add mtm.
2021-11-03 14:53 ` phodina via Guix-patches via
@ 2021-11-06 9:33 ` Nicolas Goaziou
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Goaziou @ 2021-11-06 9:33 UTC (permalink / raw)
To: 45130; +Cc: phodina
Hello,
phodina via Guix-patches via <guix-patches@gnu.org> writes:
> here's updated version of the patch where the version uses newest tag
> instead of commit. Otherwise LGTM.
Is there any reason to put the variable in suckless.scm?
> + (replace 'install
> + (lambda* (#:key inputs outputs #:allow-other-keys)
> + (let* ((out (assoc-ref outputs "out")))
> + ;; install binary
> + (mkdir-p (string-append out "bin/"))
> + (install-file "mtm" (string-append out "/bin"))
> + ;; install manpage
> + (mkdir-p (string-append out "share/man/man1"))
> + (install-file "mtm.1" (string-append out "/share/man/man1"))
> + ;; install terminfo
> + (mkdir-p (string-append out "share/terminfo"))
> + (invoke (string-append (assoc-ref inputs "ncurses") "/bin/tic")
> + "-x" "-s" "-o"
> + (string-append
> + out "/share/terminfo")
> + "mtm.ti"))
> + #t))
We can remove the trailing #t.
> + (delete 'configure))))
There's probably a missing comment "no configure script"
> + ;; FIXME: This should only be located in 'ncurses'. Nonetheless it is
> + ;; provided for usability reasons. See <https://bugs.gnu.org/22138>.
> + (native-search-paths
> + (list (search-path-specification
> + (variable "TERMINFO_DIRS")
> + (files '("share/terminfo")))))
> + (synopsis "Micro Terminal Multiplexer")
> + (description
> + "This package provides multiplexer for the terminal focused on simplicity,
> +compatibility, size and stability.")
> + (license license:gpl3+)
> + (home-page "https://github.com/deadpixi/mtm")))
Nitpick: the home-page field is usually above the synopsis.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-06 9:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-09 1:33 [bug#45130] [PATCH] gnu: Add mtm luhux
2021-11-03 14:53 ` phodina via Guix-patches via
2021-11-06 9:33 ` Nicolas Goaziou
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).