GNU bug report logs - #58831
[PATCH] gnu: emacs-tmr: Update arguments and license.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 58831 in the body.
You can then email your comments to 58831 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Aleksandr Vityazev <avityazev <at> posteo.org>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: emacs-tmr: Update arguments and license.
Date: Fri, 28 Oct 2022 09:04:00 +0000

* 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

Message #10 received at 58831-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Aleksandr Vityazev <avityazev <at> posteo.org>
Cc: 58831-done <at> debbugs.gnu.org
Subject: Re: [bug#58831] [PATCH] gnu: emacs-tmr: Update arguments and license.
Date: Sat, 29 Oct 2022 23:55:13 +0200

Hello,

Aleksandr Vityazev <avityazev <at> 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.