From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id yJKaN1SbW2OBKAAAbAwnHQ (envelope-from ) for ; Fri, 28 Oct 2022 11:05:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id OC6FN1SbW2NcHgAA9RJhRA (envelope-from ) for ; Fri, 28 Oct 2022 11:05:24 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BCFBB3B84F for ; Fri, 28 Oct 2022 11:05:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ooLIX-0001rN-FX; Fri, 28 Oct 2022 05:05:05 -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 1ooLIU-0001oc-S5 for guix-patches@gnu.org; Fri, 28 Oct 2022 05:05:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ooLIU-0004hz-Gs for guix-patches@gnu.org; Fri, 28 Oct 2022 05:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ooLIT-0002Ws-V0 for guix-patches@gnu.org; Fri, 28 Oct 2022 05:05:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58831] [PATCH] gnu: emacs-tmr: Update arguments and license. Resent-From: Aleksandr Vityazev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Oct 2022 09:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58831 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58831@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16669478719681 (code B ref -1); Fri, 28 Oct 2022 09:05:01 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1666947924; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=Naqp6qsrtoVIaofaopHHyOHAFRyA+AlUUADnQa8xT8Y=; b=JnPg+NLqWZMnw8jF9y3RD2tB+cOjmlk6zDMxtN8gHF7OhqN68ro4lxyZ+EsTY/LTQyDoXV l+xUlhNErW0ET0+u4W8BbQ8QTTWLonsCHIBthY0eEYIQoXhRLtCAD8gm6Y/pmvyJSGeD1E bQB5sd1gRSY3JY15blJpAUNcr80i8D5EMtuu3MYhDZe5aDWwUU+Zkj4HzhhDuPy5tji8+d iVJygr731Oly6Vitwj/zZi5BUUF+GkcBgaiGJqcPF2OLq1B3233yrw/8SnZQdYX9M9u29R 5KbAIJQ6kMwCDZrFQUdWN0e1J4t6+MUiE2rUXEzTcsJN9RMldlrmEA8Vn/+kbw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1666947924; a=rsa-sha256; cv=none; b=e8nwgVc2AYX0ADTdxDq3XYDO1gpzGN7ZrEpSm+4dOoTCB2mr/dGmI69GAwxDkhB3PDSoVk whfSaHOxoqjc73heGyI7j3IxaqKEGCOtcgk6KLoE/gsIkG2aZO91P9LWju9xpVDMUFE/Y4 x90vIFbcP+N3ejsUm1wMC698ByA7jUL3dDvYY55ROHugfgMpKCVIa7vMea1cphVuWMrKGK aZnk4Bm9H5z1H9OtNmSd3F+WBYe7lMui5mfsY1gBOA3cmG9OKJkQqAIQ7JkkbLYGOye2h0 ZRUtmrrvBIvrUrSF9Oc2xCtMxYq+we88XLnKPhfiFUh5iqaln3FR06rzJ7R3QQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.org header.s=2017 header.b=dz9qweC+; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.org (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.29 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.org header.s=2017 header.b=dz9qweC+; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.org (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: BCFBB3B84F X-Spam-Score: 6.29 X-Migadu-Scanner: scn0.migadu.com X-TUID: AoQNvT1qrmEr * 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