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

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Aleksandr Vityazev <avityazev <at> posteo.org>
Subject: bug#58831: closed (Re: [bug#58831] [PATCH] gnu: emacs-tmr: Update
 arguments and license.)
Date: Sat, 29 Oct 2022 21:56:02 +0000

[Message part 1 (text/plain, inline)]

Your bug report

#58831: [PATCH] gnu: emacs-tmr: Update arguments and license.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 58831 <at> debbugs.gnu.org.

-- 
58831: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=58831
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

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

[Message part 3 (message/rfc822, inline)]

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

Previous Next

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