From patchwork Mon Jul 1 20:53:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 65827 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 AEA9C27BBE9; Mon, 1 Jul 2024 21:56:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5EDF027BBE2 for ; Mon, 1 Jul 2024 21:56:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOO4D-0002Vd-UA; Mon, 01 Jul 2024 16:56: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 1sOO4A-0002T9-NA for guix-patches@gnu.org; Mon, 01 Jul 2024 16:56:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sOO4A-0002S4-FU for guix-patches@gnu.org; Mon, 01 Jul 2024 16:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOO4A-0002b4-On; Mon, 01 Jul 2024 16:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71885] [PATCH 2/3] gnu: emacs-telega: Separate server and lisp packages. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 01 Jul 2024 20:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71885@debbugs.gnu.org Cc: Sergey Trofimov , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 71885-submit@debbugs.gnu.org id=B71885.17198673279905 (code B ref 71885); Mon, 01 Jul 2024 20:56:02 +0000 Received: (at 71885) by debbugs.gnu.org; 1 Jul 2024 20:55:27 +0000 Received: from localhost ([127.0.0.1]:34862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOO3b-0002Zg-8k for submit@debbugs.gnu.org; Mon, 01 Jul 2024 16:55:27 -0400 Received: from mail-lf1-f53.google.com ([209.85.167.53]:55645) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOO3Z-0002ZG-LQ for 71885@debbugs.gnu.org; Mon, 01 Jul 2024 16:55:26 -0400 Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-52cd628f21cso3550243e87.3 for <71885@debbugs.gnu.org>; Mon, 01 Jul 2024 13:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1719867259; x=1720472059; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=N0zMs9vSkO7wVMGygsEnxxuhUZ21TIUFINxNXZroYmE=; b=Iz8Pi5Fwj4CMV04B6w5C9ZEow1OTB5wvDlLshNi/T5NXA5+KcbXj0ZivcHmMV1Iw3t 7/GCiGbqBMICo42Jzl2ItO8OKMgOorUsh7X7BSMMAp2mSrJgwX0Y1rBXG6bNA6mKXlK3 g33dqMhyMPuQeGo88BkCxGrH5SIsgFOoA83+U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719867259; x=1720472059; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N0zMs9vSkO7wVMGygsEnxxuhUZ21TIUFINxNXZroYmE=; b=FzdhUm5Pusp5zc+nCK2vjRM2CAWRnp+DL8/z3SQU2tYwcnAM+V+fQaJxWNMs/FvwyU wIa0rIua//06dPC1R+gJddTVYpw/HH75EXWD4csO8b7w+hO8878rEzXuyVEh/6d7UhXf 7b55HXkuWc4EEKqTb204ekFDoMZvmxr7d5YQkJjyV7mQffm8Z67Zn38xAVsirTMFWwSY ucLXeBkCWbEbX+X9r/mWiPYJn2/T0pl8n7/BaU8NLZCoDNVNdpCEVjjpIcZA23mWlH3E fPOJWzHyrvLIpNrGYQhJ2ms4+8o1u5OBfkhXAQRjXbOx70hro2wtlUgeDSttD4QMcF/Q qVnw== X-Gm-Message-State: AOJu0YxxKBHLiBVZwmkiQ78CNiK1Q/Sk0c7Vk+VPet8mxrLxwPwrnmSW CxcNoEG24s3GxtDp9VNH98N1TZ4i3irZZ6GR+LPKbDETC/PFnMyAybc+Q6JGqRtyanADLI+ttrE M628= X-Google-Smtp-Source: AGHT+IEJay9s629dBHF+jnJ/eHJaZyYe6/L6RaKVQIyPS/AraFmEt3t0QoNueYbZcXYTwA13kPr02g== X-Received: by 2002:a05:6512:ac6:b0:52c:d90d:d482 with SMTP id 2adb3069b0e04-52e827459a3mr4393421e87.66.1719867257677; Mon, 01 Jul 2024 13:54:17 -0700 (PDT) Received: from localhost ([2a02:2454:a09d:d000:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab06527csm358886666b.125.2024.07.01.13.54.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 13:54:17 -0700 (PDT) From: Sergey Trofimov Date: Mon, 1 Jul 2024 22:53:14 +0200 Message-ID: <970950e50d7bc58fcc56a4abd8b0f9d3288cf91b.1719866335.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-telega-server): Use own version. (emacs-telega): Remove inheritance. --- gnu/packages/emacs-xyz.scm | 123 ++++++++++++++++++++----------------- 1 file changed, 68 insertions(+), 55 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ab6a4cf4ab..57f1cfece4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -35388,11 +35388,11 @@ (define-public emacs-helm-switch-to-repl (license license:gpl3+))) (define-public emacs-telega-server - (let ((commit "009e5ce9d393aa049bb3b1182306db4b5b85833b") + (let ((commit "879a8c7afc8967942613b6b898d9ea8c1f3641bf") (revision "0")) (package (name "emacs-telega-server") - (version (git-version "0.8.290" revision commit)) + (version (git-version "0.8.2" revision commit)) (source (origin (method git-fetch) @@ -35400,11 +35400,8 @@ (define-public emacs-telega-server (url "https://github.com/zevlg/telega.el") (commit commit))) (sha256 - (base32 "06k2qkxzq3l3cdqr70zrxrnm3q6qp9nw3zgm3p65nmx86ky1q72f")) - (file-name (git-file-name "emacs-telega" version)) - (patches - (search-patches "emacs-telega-path-placeholder.patch" - "emacs-telega-test-env.patch")))) + (base32 "1ic14hzzgjxpky1r3mz4v72si9hw8cw72420a9lnpdaiw99l8q7h")) + (file-name (git-file-name "emacs-telega" version)))) (build-system gnu-build-system) (arguments (list @@ -35438,54 +35435,70 @@ (define-public emacs-telega-server (license license:gpl3+)))) (define-public emacs-telega - (package - (inherit emacs-telega-server) - (name "emacs-telega") - (build-system emacs-build-system) - (arguments - (list - #:emacs (if (target-64bit?) - emacs-minimal - ;; Require wide-int support for 32-bit platform. - emacs-wide-int) - #:include #~(cons "^etc\\/" %default-include) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-sources - (lambda* (#:key inputs #:allow-other-keys) - ;; Hard-code paths to `ffplay` and `ffmpeg`. - (let* ((ffplay-bin (search-input-file inputs "/bin/ffplay")) - (ffmpeg-bin (search-input-file inputs "/bin/ffmpeg"))) - (substitute* '("telega-ffplay.el" "telega-vvnote.el") - (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe)" - all func cmd) - (string-append func " \"" - (search-input-file - inputs (string-append "/bin/" cmd)))) - (("\\(executable-find \"ffplay\"\\)") - (string-append "(and (file-executable-p \"" ffplay-bin "\")" - "\"" ffplay-bin "\")")) - (("\\(executable-find \"ffmpeg\"\\)") - (string-append "(and (file-executable-p \"" ffmpeg-bin "\")" - "\"" ffmpeg-bin "\")")))))) - (add-after 'unpack 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "telega-customize.el" - (("@TELEGA_SERVER_BIN@") - (search-input-file inputs "/bin/telega-server"))) - (substitute* "telega-core.el" - (("@TELEGA_SHARE@") - (string-append (elpa-directory (assoc-ref outputs "out")) - "/etc")))))))) - (inputs - (list emacs-telega-server ffmpeg)) - (native-inputs '()) - (propagated-inputs - (list emacs-visual-fill-column emacs-company - emacs-rainbow-identifiers)) - (synopsis "GNU Emacs client for the Telegram messenger") - (description "Telega is a full-featured, unofficial GNU Emacs-based client -for the Telegram messaging platform."))) + (let ((commit "009e5ce9d393aa049bb3b1182306db4b5b85833b") + (revision "1")) + (package + (name "emacs-telega") + (version (git-version "0.8.290" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zevlg/telega.el") + (commit commit))) + (sha256 + (base32 "06k2qkxzq3l3cdqr70zrxrnm3q6qp9nw3zgm3p65nmx86ky1q72f")) + (file-name (git-file-name "emacs-telega" version)) + (patches + (search-patches "emacs-telega-path-placeholder.patch" + "emacs-telega-test-env.patch")))) + (build-system emacs-build-system) + (arguments + (list + #:emacs (if (target-64bit?) + emacs-minimal + ;; Require wide-int support for 32-bit platform. + emacs-wide-int) + #:include #~(cons "^etc\\/" %default-include) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda* (#:key inputs #:allow-other-keys) + ;; Hard-code paths to `ffplay` and `ffmpeg`. + (let* ((ffplay-bin (search-input-file inputs "/bin/ffplay")) + (ffmpeg-bin (search-input-file inputs "/bin/ffmpeg"))) + (substitute* '("telega-ffplay.el" "telega-vvnote.el") + (("(shell-command-to-string\|concat) \"(ffmpeg\|ffprobe)" + all func cmd) + (string-append func " \"" + (search-input-file + inputs (string-append "/bin/" cmd)))) + (("\\(executable-find \"ffplay\"\\)") + (string-append "(and (file-executable-p \"" ffplay-bin "\")" + "\"" ffplay-bin "\")")) + (("\\(executable-find \"ffmpeg\"\\)") + (string-append "(and (file-executable-p \"" ffmpeg-bin "\")" + "\"" ffmpeg-bin "\")")))))) + (add-after 'unpack 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "telega-customize.el" + (("@TELEGA_SERVER_BIN@") + (search-input-file inputs "/bin/telega-server"))) + (substitute* "telega-core.el" + (("@TELEGA_SHARE@") + (string-append (elpa-directory (assoc-ref outputs "out")) + "/etc")))))))) + (inputs + (list emacs-telega-server ffmpeg)) + (native-inputs '()) + (propagated-inputs + (list emacs-visual-fill-column emacs-company + emacs-rainbow-identifiers)) + (home-page "https://zevlg.github.io/telega.el/") + (synopsis "GNU Emacs client for the Telegram messenger") + (description "Telega is a full-featured, unofficial GNU Emacs-based client +for the Telegram messaging platform.") + (license license:gpl3+)))) (define-public emacs-telega-contrib (package