From patchwork Fri Jun 25 05:48:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 30691 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DA0C827BC78; Fri, 25 Jun 2021 06:49:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 90CC227BC81 for ; Fri, 25 Jun 2021 06:49:10 +0100 (BST) Received: from localhost ([::1]:53760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lweiD-00060j-Ku for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 01:49:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwei6-00060V-4u for guix-patches@gnu.org; Fri, 25 Jun 2021 01:49:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwei5-0001B2-U0 for guix-patches@gnu.org; Fri, 25 Jun 2021 01:49:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwei5-0006k2-TT for guix-patches@gnu.org; Fri, 25 Jun 2021 01:49:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49219] [PATCH]: Update emacs-telega. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 05:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49219@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162460012825885 (code B ref -1); Fri, 25 Jun 2021 05:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jun 2021 05:48:48 +0000 Received: from localhost ([127.0.0.1]:44625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwehj-0006jJ-Vc for submit@debbugs.gnu.org; Fri, 25 Jun 2021 01:48:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:41260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwehe-0006j8-Im for submit@debbugs.gnu.org; Fri, 25 Jun 2021 01:48:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwehe-0005ze-8l for guix-patches@gnu.org; Fri, 25 Jun 2021 01:48:34 -0400 Received: from mail-m971.mail.163.com ([123.126.97.1]:49628) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lweha-0000en-0a for guix-patches@gnu.org; Fri, 25 Jun 2021 01:48:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=I9+aZ akAyeITS8b4ChU+2EubgcLkrhUaRVeXuyNElX8=; b=BZoSzfdM64ak8Xq2/VLi6 FTUJ7P3QnjYfcTt5qcHUlAHeeKP81HnsFBy2IYhbSTKBLoFn568CVLJ6D1g0Pz3q NyIyZZPRLVFarFnQU68DWyUkhY4Pmb8fQrUm9U2v2bSi+Toz1YWpEr3sVGug1o6u JiRBkpimTB1/IjmngDjHZg= Received: from asus-laptop (unknown [27.38.248.154]) by smtp1 (Coremail) with SMTP id GdxpCgBn_G0lbtVgOIR6GQ--.15S2; Fri, 25 Jun 2021 13:48:22 +0800 (CST) User-agent: mu4e 1.4.15; emacs 27.2 From: Zhu Zihao Date: Fri, 25 Jun 2021 13:48:20 +0800 Message-ID: <86mtre8pgb.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: GdxpCgBn_G0lbtVgOIR6GQ--.15S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUD1SrUUUUU X-Originating-IP: [27.38.248.154] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbitAa8r1SImCUaZwAAs9 Received-SPF: pass client-ip=123.126.97.1; envelope-from=all_but_last@163.com; helo=mail-m971.mail.163.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Some questions that Guix maintainer may have interest in: 1. Why separate telega-server to a dedicated package? emacs-build-system is quite cumbersome due to the different install step than gnu-build-system, if we try to mix the build code of server into it via 'modify-phases', it'll be very hard to read and understand the logic of package code. Move telega-server to a dedicated package can also help us separate package, if there's a program uses telega-server, it doesn't have to add emacs-telega as input, they just add emacs-telega-server. 2. Why propagated ffmpeg. I check the source and found that telega use binaries from ffmpeg many different place in telega-ffplay.el and telega-vvnote.el. So it's better to propagated it because it's not easy to fix them all. 3. Why install resources to '/share/emacs-telega'? I think it is closer to the flavor of FHS, and it's not hard to achieve it. From 84963cfc29a53cb6d31850bd3fc85de3d5a4c893 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 25 Jun 2021 13:29:30 +0800 Subject: [PATCH 3/3] gnu: emacs-telega-contrib: Update to 0.7.024. * gnu/packages/emacs-xyz.scm(emacs-telega-contrib): Update to 0.7.024. [arguments]: Back to root directory of build before phase 'install-license-files' to properly install licenses. [propagated-inputs]: Add emacs-dashboard, emacs-transient. --- gnu/packages/emacs-xyz.scm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c8540bbead..872f2253a0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26116,19 +26116,28 @@ service, and connect it with Emacs via inter-process communication.") for the Telegram messaging platform."))) (define-public emacs-telega-contrib - (package/inherit emacs-telega + (package + (inherit emacs-telega) (name "emacs-telega-contrib") - (build-system emacs-build-system) (arguments `(#:exclude '("telega-live-location.el") #:phases (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "contrib") #t))))) + (add-after 'unpack 'enter-subdirectory + (lambda _ (chdir "contrib") #t)) + (add-before 'install-license-files 'leave-subdirectory + (lambda _ (chdir "..") #t))))) + (inputs '()) + (native-inputs '()) (propagated-inputs - `(("emacs-telega" ,emacs-telega) - ("emacs-alert" ,emacs-alert) - ("emacs-all-the-icons" ,emacs-all-the-icons))))) + `(("emacs-alert" ,emacs-alert) + ("emacs-all-the-icons" ,emacs-all-the-icons) + ("emacs-dashboard" ,emacs-dashboard) + ("emacs-telega" ,emacs-telega) + ("emacs-transient" ,emacs-transient))) + (synopsis "Contributed packages to Telega") + (description "Telega-contrib is a collection of third-party +contributed packages to Telega."))) (define-public emacs-doom-modeline (package -- 2.32.0