* [bug#58831] [PATCH] gnu: emacs-tmr: Update arguments and license.
@ 2022-10-28 9:04 Aleksandr Vityazev
2022-10-29 21:55 ` bug#58831: " Nicolas Goaziou
0 siblings, 1 reply; 2+ messages in thread
From: Aleksandr Vityazev @ 2022-10-28 9:04 UTC (permalink / raw)
To: 58831
* gnu/packages/emacs-xyz.scm (emacs-trm): [arguments]:
Rename patch-ffplay phase to patch-paths and substitute
tmr-sound-file variable. Add makeinfo phase;
[inputs]: Add sound-theme-freedesktop;
[license]: Add fdl1.3+;
[use-modules]: Add (gnu packages libcanberra).
---
gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0a679c7167..b598ec6962 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -245,6 +245,7 @@ (define-module (gnu packages emacs-xyz)
#:use-module (gnu packages ocaml)
#:use-module (gnu packages erlang)
#:use-module (gnu packages statistics)
+ #:use-module (gnu packages libcanberra)
#:use-module (guix utils)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match))
@@ -14502,21 +14503,35 @@ (define-public emacs-tmr
(list
#:phases
#~(modify-phases %standard-phases
- (add-after 'unpack 'patch-ffplay
+ (add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((ffplay (search-input-file inputs "/bin/ffplay")))
(make-file-writable "tmr.el")
(substitute* "tmr.el"
(("\"ffplay")
- (string-append "\"" ffplay)))))))))
+ (string-append "\"" ffplay))))
+ (emacs-substitute-variables "tmr.el"
+ ("tmr-sound-file"
+ (string-append
+ #$(this-package-input "sound-theme-freedesktop")
+ "/share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga")))))
+ (add-after 'install 'makeinfo
+ (lambda _
+ (invoke "emacs"
+ "--batch"
+ "--eval=(require 'ox-texinfo)"
+ "--eval=(find-file \"README.org\")"
+ "--eval=(org-texinfo-export-to-info)")
+ (install-file "tmr.info" (string-append #$output "/share/info")))))))
(native-inputs (list texinfo))
- (inputs (list ffmpeg))
+ (inputs (list ffmpeg sound-theme-freedesktop))
(home-page "https://protesilaos.com/emacs/tmr/")
(synopsis "Set timers using a convenient notation")
(description
"TMR is an Emacs package that provides facilities for setting timers
using a convenient notation.")
- (license license:gpl3+)))
+ (license (list license:gpl3+
+ license:fdl1.3+)))) ;GFDLv1.3+ for the manual
(define-public emacs-gn-mode
(package
--
2.38.0
--
Aleksandr Vityazev
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#58831: [PATCH] gnu: emacs-tmr: Update arguments and license.
2022-10-28 9:04 [bug#58831] [PATCH] gnu: emacs-tmr: Update arguments and license Aleksandr Vityazev
@ 2022-10-29 21:55 ` Nicolas Goaziou
0 siblings, 0 replies; 2+ messages in thread
From: Nicolas Goaziou @ 2022-10-29 21:55 UTC (permalink / raw)
To: Aleksandr Vityazev; +Cc: 58831-done
Hello,
Aleksandr Vityazev <avityazev@posteo.org> writes:
> + (emacs-substitute-variables "tmr.el"
> + ("tmr-sound-file"
> + (string-append
> + #$(this-package-input "sound-theme-freedesktop")
> + "/share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga")))))
Nitpick: I used `search-input-file' instead of `this-package-input'.
Applied. Thank you.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-29 21:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-28 9:04 [bug#58831] [PATCH] gnu: emacs-tmr: Update arguments and license Aleksandr Vityazev
2022-10-29 21:55 ` bug#58831: " 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).