From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 28 05:04:31 2022 Received: (at submit) by debbugs.gnu.org; 28 Oct 2022 09:04:31 +0000 Received: from localhost ([127.0.0.1]:60377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooLHz-0002W4-6e for submit@debbugs.gnu.org; Fri, 28 Oct 2022 05:04:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:34534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooLHx-0002Vx-Of for submit@debbugs.gnu.org; Fri, 28 Oct 2022 05:04:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ooLHh-0001EX-BC for guix-patches@gnu.org; Fri, 28 Oct 2022 05:04:21 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ooLHd-0004c6-Um for guix-patches@gnu.org; Fri, 28 Oct 2022 05:04:12 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 145DB24002B for ; Fri, 28 Oct 2022 11:04:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.org; s=2017; t=1666947844; bh=Kwg7H1cQQK6LXq3ZEcbdxnRjzJI7cCO95ESokr8i5Ds=; h=From:To:Subject:Date:From; b=dz9qweC+UUQqDa1G4uJ7R94UeaXXW0O6WevxP2/SHJR65cZmj4cdkOBcNZD/DKHUC dCmMJFYWdFyaKCWCrzzGNSTrPpQspoovcJALHMNC03lehZriSwktIE0OHAXFopRbsV TMSVDuy8Wo5x3X5f6lXaHG6l0KA67Z8RaMH4bTUfRJ+QUrpJ9iLrO5pM/mgYwHTPeD 5M/Z4NihhO3iIZxjbn7eEyd5MJ5yqaE/pHmSSlzgRuUDOZ0uG3SctUwkBEGyKsz6kO OkYwDcWW035WJHCY33qcPdnxDxW5W8dCkhHX0jTvb0nHArJ85zvPwFoncRFPQ1OqJV JZPzgracq1IMA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MzGnG6YsWz6trF for ; Fri, 28 Oct 2022 11:04:02 +0200 (CEST) From: Aleksandr Vityazev To: guix-patches@gnu.org Subject: [PATCH] gnu: emacs-tmr: Update arguments and license. Message-Id: <090b44dbb6d53118c35817788ae9d31cd702870b.1666947787.git.avityazev@posteo.org> Date: Fri, 28 Oct 2022 09:04:00 +0000 MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=185.67.36.65; envelope-from=avityazev@posteo.org; helo=mout01.posteo.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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 From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 29 17:55:27 2022 Received: (at 58831-done) by debbugs.gnu.org; 29 Oct 2022 21:55:27 +0000 Received: from localhost ([127.0.0.1]:36819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ootna-0001v5-Ni for submit@debbugs.gnu.org; Sat, 29 Oct 2022 17:55:26 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:57647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ootnW-0001uq-Fp for 58831-done@debbugs.gnu.org; Sat, 29 Oct 2022 17:55:25 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id EC5D8FF802; Sat, 29 Oct 2022 21:55:15 +0000 (UTC) From: Nicolas Goaziou To: Aleksandr Vityazev Subject: Re: [bug#58831] [PATCH] gnu: emacs-tmr: Update arguments and license. References: <090b44dbb6d53118c35817788ae9d31cd702870b.1666947787.git.avityazev@posteo.org> Date: Sat, 29 Oct 2022 23:55:13 +0200 In-Reply-To: <090b44dbb6d53118c35817788ae9d31cd702870b.1666947787.git.avityazev@posteo.org> (Aleksandr Vityazev's message of "Fri, 28 Oct 2022 09:04:00 +0000") Message-ID: <877d0ipa66.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 58831-done Cc: 58831-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Aleksandr Vityazev 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 From unknown Tue Aug 19 05:09:01 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 27 Nov 2022 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator