From patchwork Sun Oct 23 05:49:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Declan Tsien X-Patchwork-Id: 6946 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 EDCC227BBEA; Mon, 24 Oct 2022 03:34:28 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 A43AC27BBE9 for ; Mon, 24 Oct 2022 03:34:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omkpp-0000qe-CH for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 19:56:53 -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 1omTt3-0002dl-NH for guix-patches@gnu.org; Sun, 23 Oct 2022 01:51:09 -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 1omTt0-00072y-OE for guix-patches@gnu.org; Sun, 23 Oct 2022 01:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omTt0-00055R-G3 for guix-patches@gnu.org; Sun, 23 Oct 2022 01:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58730] [PATCH] Split emacs-piem and emacs-git-email Resent-From: Declan Tsien Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Oct 2022 05:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58730@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166650421718708 (code B ref -1); Sun, 23 Oct 2022 05:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Oct 2022 05:50:17 +0000 Received: from localhost ([127.0.0.1]:42773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omTsG-0004rf-8s for submit@debbugs.gnu.org; Sun, 23 Oct 2022 01:50:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:49468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omTsD-0004rT-7U for submit@debbugs.gnu.org; Sun, 23 Oct 2022 01:50:14 -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 1omTsC-0002WU-63 for guix-patches@gnu.org; Sun, 23 Oct 2022 01:50:12 -0400 Received: from mx1.riseup.net ([198.252.153.129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1omTs9-0006Gl-15 for guix-patches@gnu.org; Sun, 23 Oct 2022 01:50:11 -0400 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4Mw6jp0ttRzDqKh for ; Sun, 23 Oct 2022 05:50:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1666504206; bh=DADhUQwR+mhsqsn1ZfHXpbstMQrLDRolG7iIr/g2YAk=; h=From:To:Subject:Date:From; b=FdgJ/QKgZ1bp3jjblQg0peN2P4jnkh/mfJ3XqesLWIPVeOMStKDvrbgFDizR5fsQL tT3vzjbEGuUKmVmtx4/ytsrAk7RTWx53IS5Ym+TuTZil1eAUHO5/sICgv5hc7fDRaz 8csjCKq04UEAzL69E4tLYs4fWgdMN/2/zDIw4RTg= X-Riseup-User-ID: FD862CCE93100B4D002C5ACE4F1003A76F838A4B374D190C64D035CADC3C91D2 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4Mw6jn3yy0z5vTf for ; Sun, 23 Oct 2022 05:50:05 +0000 (UTC) From: Declan Tsien Date: Sun, 23 Oct 2022 13:49:54 +0800 Message-ID: <87r0yzks1p.fsf@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.129; envelope-from=declantsien@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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 Currently, emacs-piem and emacs-git-email bundle multiple lisp files with identical functionality but for different tastes. Split into separated packages would avoid pulling unnecessary dependencies into user profile. Also fix info manual for emacs-git-email and add info-manual for emacs-piem From d0c79a8c055c3818c1ea97e4cf0aa373303025e5 Mon Sep 17 00:00:00 2001 From: Declan Tsien Date: Sun, 23 Oct 2022 11:48:13 +0800 Subject: [PATCH 4/4] gnu: emacs-git-email: Split into multiple separated packages. emacs-git-email currently bundles multiple lisp files with identical functionality but for different tastes. Split into separated packages would avoid pulling unnecessary dependencies into user profile. * gnu/packages/emacs-xyz.scm (emacs-git-email): Split into multiple separated packages. * gnu/packages/emacs-xyz.scm (emacs-git-email-gnus): New Variable. * gnu/packages/emacs-xyz.scm (emacs-git-email-magit): New Variable. * gnu/packages/emacs-xyz.scm (emacs-git-email-mu4e): New Variable. * gnu/packages/emacs-xyz.scm (emacs-git-email-notmuch): New Variable. * gnu/packages/emacs-xyz.scm (emacs-git-email-piem): New Variable. --- gnu/packages/emacs-xyz.scm | 115 +++++++++++++++++++++++++++++-------- 1 file changed, 90 insertions(+), 25 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3f62e92116..0bbae04f08 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17405,39 +17405,104 @@ (define-public emacs-git-email (package (name "emacs-git-email") (version (git-version "0.2.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.sr.ht/~yoctocell/git-email") - (commit commit))) - (patches - (search-patches "emacs-git-email-missing-parens.patch")) - (file-name (git-file-name name version)) - (sha256 - (base32 "1lk1yds7idgawnair8l3s72rgjmh80qmy4kl5wrnqvpmjrmdgvnx")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~yoctocell/git-email") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1lk1yds7idgawnair8l3s72rgjmh80qmy4kl5wrnqvpmjrmdgvnx")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - ;; piem is not yet packaged in Guix. - (add-after 'unpack 'remove-piem - (lambda _ - (delete-file "git-email-piem.el"))) - (add-before 'install 'makeinfo - (lambda _ - (invoke "make" "doc/git-email.info") - (rename-file "doc/git-email.info" "git-email.info")))))) - (native-inputs - (list texinfo)) - (propagated-inputs - (list mu emacs-magit emacs-notmuch)) + (list #:exclude #~(cons* "^git-email-gnus.el" + "^git-email-magit.el" + "^git-email-mu4e.el" + "^git-email-notmuch.el" + "^git-email-piem.el" + %default-exclude) + #:phases #~(modify-phases %standard-phases + (add-before 'install 'makeinfo + (lambda _ + (invoke "make" "doc/git-email.info") + (rename-file "doc/git-email.info" + "git-email.info")))))) + (native-inputs (list texinfo)) (license license:gpl3+) (home-page "https://sr.ht/~yoctocell/git-email") (synopsis "Format and send Git patches in Emacs") (description "This package provides utilities for formatting and sending Git patches via Email, without leaving Emacs.")))) +(define-public emacs-git-email-gnus + (package + (inherit emacs-git-email) + (name "emacs-git-email-gnus") + (propagated-inputs (list emacs-git-email)) + (arguments + (list #:include #~(list "git-email-gnus.el"))) + (synopsis "Gnus integration for git-email") + (description + "This library sets some variables for git-email to make it work +better with Gnus."))) + +(define-public emacs-git-email-magit + (package + (inherit emacs-git-email) + (name "emacs-git-email-magit") + (propagated-inputs (list emacs-git-email emacs-magit)) + (arguments + (list #:include #~(list "git-email-magit.el"))) + (synopsis "Magit integration for git-email") + (description + "This library offers transient commands in the magit-status buffer +for interacting with git-email."))) + +(define-public emacs-git-email-mu4e + (package + (inherit emacs-git-email) + (name "emacs-git-email-mu4e") + (propagated-inputs (list emacs-git-email mu)) + (inputs (list `("emacs-git-email-mu4e-patch" ,(car (search-patches + "emacs-git-email-missing-parens.patch"))))) + (arguments + (list #:include #~(list "git-email-mu4e.el") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'apply-patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch (assoc-ref inputs + "emacs-git-email-mu4e-patch"))) + (invoke "patch" "-p1" "--batch" "-i" patch))))))) + (synopsis "Mu4e integration for git-email") + (description + "This library sets some variables for git-email to make it work +better with @code{mu}."))) + +(define-public emacs-git-email-notmuch + (package + (inherit emacs-git-email) + (name "emacs-git-email-notmuch") + (propagated-inputs (list emacs-git-email emacs-notmuch)) + (arguments + (list #:include #~(list "git-email-notmuch.el"))) + (synopsis "Notmuch integration for git-email") + (description + "This library sets some variables for git-email to make it work +better with @code{emacs-notmuch}."))) + +(define-public emacs-git-email-piem + (package + (inherit emacs-git-email) + (name "emacs-git-email-piem") + (propagated-inputs (list emacs-git-email emacs-piem)) + (arguments + (list #:include #~(list "git-email-piem.el"))) + (synopsis "Piem integration for git-email") + (description + "This library sets some variables for git-email to make it work +better with @code{emacs-piem}."))) + (define-public emacs-erc-hl-nicks (package (name "emacs-erc-hl-nicks") -- 2.38.0