From unknown Tue Jun 17 01:48:51 2025 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 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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-Spam-Score: -1.4 (-) 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.4 (--) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-emacs-git-email-Fix-makeinfo.patch Content-Transfer-Encoding: quoted-printable From=206b44b4998369f01365c0ddb1b935072cfefcbe1b Mon Sep 17 00:00:00 2001 From: Declan Tsien Date: Sun, 23 Oct 2022 11:40:07 +0800 Subject: [PATCH 1/4] gnu: emacs-git-email: Fix makeinfo. * gnu/packages/emacs-xyz.scm (emacs-git-email): Fix makeinfo. =2D-- gnu/packages/emacs-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 06ec9dd904..be6d4c6ba3 100644 =2D-- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17341,7 +17341,8 @@ (define-public emacs-git-email (delete-file "git-email-piem.el"))) (add-before 'install 'makeinfo (lambda _ =2D (invoke "makeinfo" "doc/git-email.texi")))))) + (invoke "make" "doc/git-email.info") + (rename-file "doc/git-email.info" "git-email.info")))))) (native-inputs (list texinfo)) (propagated-inputs base-commit: 1f734a6f0a7db5b0e12091a0c869c5c4810ac80e =2D-=20 2.38.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-emacs-piem-Add-build-info-manual-phase.patch Content-Transfer-Encoding: quoted-printable From=203d6c28a0cbeed2f38d91cd31155a257578675f6d Mon Sep 17 00:00:00 2001 From: Declan Tsien Date: Sun, 23 Oct 2022 11:42:19 +0800 Subject: [PATCH 2/4] gnu: emacs-piem: Add build-info-manual phase. * gnu/packages/emacs-xyz.scm (emacs-piem): Add build-info-manual phase. [native-inputs]: Add texinfo. =2D-- gnu/packages/emacs-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index be6d4c6ba3..bc56067a7c 100644 =2D-- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7151,9 +7151,15 @@ (define-public emacs-piem (lambda* (#:key inputs #:allow-other-keys) (emacs-substitute-variables "piem-b4.el" ("piem-b4-b4-executable" =2D (search-input-file inputs "/bin/b4")))))))) + (search-input-file inputs "/bin/b4"))))) + (add-after 'unpack 'build-info-manual + (lambda _ + (invoke "make" "Documentation/piem.info") + (rename-file "Documentation/piem.info" "piem.info")))))) (inputs (list b4)) + (native-inputs + (list texinfo)) (propagated-inputs (list emacs-elfeed emacs-notmuch =2D-=20 2.38.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0003-gnu-emacs-piem-Split-into-multiple-separated-package.patch Content-Transfer-Encoding: quoted-printable From=20ff45839e29bad8bd4fa5d9b4868b3f68fe8d300d Mon Sep 17 00:00:00 2001 From: Declan Tsien Date: Sun, 23 Oct 2022 11:46:37 +0800 Subject: [PATCH 3/4] gnu: emacs-piem: Split into multiple separated package= s. emacs-piem currently bundles multiple lisp files with identical functionali= ty but for different tastes. Split into separated packages would avoid pulling unnecessary dependencies into user profile. * gnu/packages/emacs-xyz.scm (emacs-piem): Split into multiple separated packages. * gnu/packages/emacs-xyz.scm (emacs-piem-b4): New variable. * gnu/packages/emacs-xyz.scm (emacs-piem-elfeed): New variable. * gnu/packages/emacs-xyz.scm (emacs-piem-eww): New variable. * gnu/packages/emacs-xyz.scm (emacs-piem-gnus): New variable. * gnu/packages/emacs-xyz.scm (emacs-piem-notmuch): New variable. * gnu/packages/emacs-xyz.scm (emacs-piem-rmail): New variable. * gnu/packages/emacs-xyz.scm (emacs-piem-lei): New variable. =2D-- gnu/packages/emacs-xyz.scm | 139 +++++++++++++++++++++++++++++-------- 1 file changed, 109 insertions(+), 30 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bc56067a7c..3f62e92116 100644 =2D-- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7134,45 +7134,124 @@ (define-public emacs-piem (package (name "emacs-piem") (version "0.4.0") =2D (source =2D (origin =2D (method git-fetch) =2D (uri (git-reference =2D (url "https://git.kyleam.com/piem") =2D (commit (string-append "v" version)))) =2D (file-name (string-append name "-" version "-checkout")) =2D (sha256 =2D (base32 "0wr6n6wvznngjdp4c0pmdr4xz05dark0kxi5svzhzxsg3rdaql3z"))= )) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kyleam.com/piem") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0wr6n6wvznngjdp4c0pmdr4xz05dark0kxi5svzhzxsg3rdaql3z")))) (build-system emacs-build-system) (arguments =2D (list #:phases =2D #~(modify-phases %standard-phases =2D (add-after 'unpack 'configure =2D (lambda* (#:key inputs #:allow-other-keys) =2D (emacs-substitute-variables "piem-b4.el" =2D ("piem-b4-b4-executable" =2D (search-input-file inputs "/bin/b4"))))) =2D (add-after 'unpack 'build-info-manual =2D (lambda _ =2D (invoke "make" "Documentation/piem.info") =2D (rename-file "Documentation/piem.info" "piem.info")))= ))) =2D (inputs =2D (list b4)) =2D (native-inputs =2D (list texinfo)) =2D (propagated-inputs =2D (list emacs-elfeed =2D emacs-notmuch =2D emacs-transient)) =2D (home-page "https://docs.kyleam.com/piem") + (list #:exclude #~(cons* "^piem-b4.el" + "^piem-elfeed.el" + "^piem-eww.el" + "^piem-gnus.el" + "^piem-lei.el" + "^piem-notmuch.el" + "^piem-rmail.el" + %default-exclude) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'build-info-manual + (lambda _ + (invoke "make" "Documentation/piem.info") + (rename-file "Documentation/piem.info" "piem.i= nfo")))))) + (native-inputs (list texinfo)) + (propagated-inputs (list emacs-transient)) + (home-page "https://docs.kyleam.com/piem/") (synopsis "Glue for working with public-inbox archives") =2D (description "This packages provides a collection of Emacs libraries= for + (description + "This package provides a collection of Emacs libraries for working with public-inbox archives. As much of the hard work here is alre= ady done by other Emacs libraries=E2=80=94things like mail clients, news reade= rs, Git interfaces, and even web browsers=E2=80=94piem is mostly about bridging so= me of these parts for convenience.") (license license:gpl3+))) =20 +(define-public emacs-piem-b4 + (package + (inherit emacs-piem) + (name "emacs-piem-b4") + (inputs (list b4)) + (propagated-inputs (list emacs-piem)) + (arguments + (list #:include #~(list "piem-b4.el") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (emacs-substitute-variables "piem-b4.el" + ("piem-b4-b4-execu= table" + (search-input-file + inputs "/bin/b4"= )))))))) + (synopsis "Emacs interface to the b4 tool") + (description + "This library provides a @code{emacs-transient} interface to @code{b4= }. It is +documented in the piem manual."))) + +(define-public emacs-piem-elfeed + (package + (inherit emacs-piem) + (name "emacs-piem-elfeed") + (propagated-inputs (list emacs-piem emacs-elfeed)) + (arguments + (list #:include #~(list "piem-elfeed.el"))) + (synopsis "Elfeed integration for piem") + (description + "This library provides @code{emacs-elfeed} integration for @code{piem= }."))) + +(define-public emacs-piem-eww + (package + (inherit emacs-piem) + (name "emacs-piem-eww") + (propagated-inputs (list emacs-piem)) + (arguments + (list #:include #~(list "piem-eww.el"))) + (synopsis "EWW integration for piem") + (description "This library provides EWW integration for @code{piem}.")= )) + +(define-public emacs-piem-gnus + (package + (inherit emacs-piem) + (name "emacs-piem-gnus") + (propagated-inputs (list emacs-piem)) + (arguments + (list #:include #~(list "piem-gnus.el"))) + (synopsis "Gnus integration for piem") + (description "This library provides Gnus integration for @code{piem}."= ))) + +(define-public emacs-piem-notmuch + (package + (inherit emacs-piem) + (name "emacs-piem-notmuch") + (propagated-inputs (list emacs-piem emacs-notmuch)) + (arguments + (list #:include #~(list "piem-notmuch.el"))) + (synopsis "Notmuch integration for piem") + (description + "This library provides @code{emacs-notmuch} integration for @code{pie= m}."))) + +(define-public emacs-piem-rmail + (package + (inherit emacs-piem) + (name "emacs-piem-rmail") + (propagated-inputs (list emacs-piem)) + (arguments + (list #:include #~(list "piem-rmail.el"))) + (synopsis "Rmail integration for piem") + (description "This library provides Rmail integration for @code{piem}.= "))) + +(define-public emacs-piem-lei + (package + (inherit emacs-piem) + (name "emacs-piem-lei") + (propagated-inputs (list emacs-piem)) + (arguments + (list #:include #~(list "piem-lei.el"))) + (synopsis "Lei integration for piem") + (description "This library provides lei integration for @code{piem}.")= )) + (define-public emacs-ert-expectations (package (name "emacs-ert-expectations") =2D-=20 2.38.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-emacs-git-email-Split-into-multiple-separated-pa.patch Content-Transfer-Encoding: quoted-printable From=20d0c79a8c055c3818c1ea97e4cf0aa373303025e5 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 separat= ed 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. =2D-- 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 =2D-- 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)) =2D (source =2D (origin =2D (method git-fetch) =2D (uri (git-reference =2D (url "https://git.sr.ht/~yoctocell/git-email") =2D (commit commit))) =2D (patches =2D (search-patches "emacs-git-email-missing-parens.patch")) =2D (file-name (git-file-name name version)) =2D (sha256 =2D (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 =2D `(#:phases =2D (modify-phases %standard-phases =2D ;; piem is not yet packaged in Guix. =2D (add-after 'unpack 'remove-piem =2D (lambda _ =2D (delete-file "git-email-piem.el"))) =2D (add-before 'install 'makeinfo =2D (lambda _ =2D (invoke "make" "doc/git-email.info") =2D (rename-file "doc/git-email.info" "git-email.info")))))) =2D (native-inputs =2D (list texinfo)) =2D (propagated-inputs =2D (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.")))) =20 +(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-m= issing-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") =2D-=20 2.38.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHLBAEBCAA1FiEE9pXznsYl4IEztXWfD8aHA3Xv4vUFAmNU1gIXHGRlY2xhbnRz aWVuQHJpc2V1cC5uZXQACgkQD8aHA3Xv4vW1rgwAqYRb2u32Itg/dn9G0OjVIzpL GGGqMYH4gCv+8TIzQ8/eNnIEdqJBvVo1rYC8+lTtv+6WuQJHd4KFgR7DzAE6USYV UfLWXKmiT1+mVTdFb6gzbGUiBVe5hYn7VwDIHiVDTgkpCP/AbHXFD32B02ytraSl xIvG0W8wOJMo7X8va1OwdkC+HLdpTUrCM+4hdgcxcUjXbfkx9Db3wCMx/Jt3yXuZ TNey3KmX95kYELJnIkFnIZDKTKCNQd5AoGy93CRmL74Sg1vqg64A1BGuR0Zi7PvW eT4kx2ccG69Wdq+Y+zvoIttKnI5B1krpcfy8D3Bfk+JmrrgCZLpERtVmzgjZ4RRj X0EaEiSKQT8onAtD8xO/xXILMMmzUKLQPxQVzRHAyisC4x2+mCm7JibRwaWE6g7c X1Ovl3upvWAfg1FFulKwq+33lT+jl7JTffAO+WzaZm4URFTT2NC3CLzIgtihgb2I myx26kEiri6C9TjEjcLB647wZYTOuTibwPT9F9Qu =xeOK -----END PGP SIGNATURE----- --==-=-=-- From unknown Tue Jun 17 01:48:51 2025 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: Tue, 25 Oct 2022 01:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58730@debbugs.gnu.org Cc: Niklas Eklund , zimoun Received: via spool by 58730-submit@debbugs.gnu.org id=B58730.16666605761281 (code B ref 58730); Tue, 25 Oct 2022 01:17:02 +0000 Received: (at 58730) by debbugs.gnu.org; 25 Oct 2022 01:16:16 +0000 Received: from localhost ([127.0.0.1]:49812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1on8YB-0000Ka-2g for submit@debbugs.gnu.org; Mon, 24 Oct 2022 21:16:16 -0400 Received: from mx0.riseup.net ([198.252.153.6]:57948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1on8Y5-0000KJ-HO for 58730@debbugs.gnu.org; Mon, 24 Oct 2022 21:16:13 -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 mx0.riseup.net (Postfix) with ESMTPS id 4MxDXg3jkgz9s35; Tue, 25 Oct 2022 01:16:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1666660563; bh=mRRUcuYgFHfdtVj77qL015rp9WCIXKb59WvX3z/0Sdk=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=ZJZYHVdvZbDanbnwl/bC6fhIRUxj93xYEi3UGAC9lIOpbEJENORsUoc+L45p4/RdW HmiV15BpCWSiCqVtTGNXLIi5bledbcV4o1aK4jB0AEXlNMRMbzkwXMNcHFwOTbFeS8 bZOLQ6POHp+HsawwSjQpcmHDxuTih8fZoPmUcMWA= X-Riseup-User-ID: BA49DC81A0D5A732ED0C35F1B1D93340AA333ED4F4733E3FF3A2CDCF1AC463E7 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4MxDXf3bpdz5vNf; Tue, 25 Oct 2022 01:16:02 +0000 (UTC) From: Declan Tsien In-Reply-To: <87r0yzks1p.fsf@riseup.net> References: <87r0yzks1p.fsf@riseup.net> Date: Tue, 25 Oct 2022 09:15:52 +0800 Message-ID: <87zgdkzos7.fsf@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Declan Tsien writes: > 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 6b44b4998369f01365c0ddb1b935072cfefcbe1b Mon Sep 17 00:00:00 2001 > From: Declan Tsien > Date: Sun, 23 Oct 2022 11:40:07 +0800 > Subject: [PATCH 1/4] gnu: emacs-git-email: Fix makeinfo. > > * gnu/packages/emacs-xyz.scm (emacs-git-email): Fix makeinfo. > --- > gnu/packages/emacs-xyz.scm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index 06ec9dd904..be6d4c6ba3 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -17341,7 +17341,8 @@ (define-public emacs-git-email > (delete-file "git-email-piem.el"))) > (add-before 'install 'makeinfo > (lambda _ > - (invoke "makeinfo" "doc/git-email.texi")))))) > + (invoke "make" "doc/git-email.info") > + (rename-file "doc/git-email.info" "git-email.info")))))) > (native-inputs > (list texinfo)) > (propagated-inputs > > base-commit: 1f734a6f0a7db5b0e12091a0c869c5c4810ac80e > --=20 > 2.38.0 > > From 3d6c28a0cbeed2f38d91cd31155a257578675f6d Mon Sep 17 00:00:00 2001 > From: Declan Tsien > Date: Sun, 23 Oct 2022 11:42:19 +0800 > Subject: [PATCH 2/4] gnu: emacs-piem: Add build-info-manual phase. > > * gnu/packages/emacs-xyz.scm (emacs-piem): Add build-info-manual phase. > [native-inputs]: Add texinfo. > --- > gnu/packages/emacs-xyz.scm | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index be6d4c6ba3..bc56067a7c 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -7151,9 +7151,15 @@ (define-public emacs-piem > (lambda* (#:key inputs #:allow-other-keys) > (emacs-substitute-variables "piem-b4.el" > ("piem-b4-b4-executable" > - (search-input-file inputs "/bin/b4")))))))) > + (search-input-file inputs "/bin/b4"))))) > + (add-after 'unpack 'build-info-manual > + (lambda _ > + (invoke "make" "Documentation/piem.info") > + (rename-file "Documentation/piem.info" "piem.info")))= ))) > (inputs > (list b4)) > + (native-inputs > + (list texinfo)) > (propagated-inputs > (list emacs-elfeed > emacs-notmuch > --=20 > 2.38.0 > > From ff45839e29bad8bd4fa5d9b4868b3f68fe8d300d Mon Sep 17 00:00:00 2001 > From: Declan Tsien > Date: Sun, 23 Oct 2022 11:46:37 +0800 > Subject: [PATCH 3/4] gnu: emacs-piem: Split into multiple separated packa= ges. > > emacs-piem currently bundles multiple lisp files with identical functiona= lity > but for different tastes. Split into separated packages would avoid pulli= ng > unnecessary dependencies into user profile. > > * gnu/packages/emacs-xyz.scm (emacs-piem): Split into multiple separated > packages. > * gnu/packages/emacs-xyz.scm (emacs-piem-b4): New variable. > * gnu/packages/emacs-xyz.scm (emacs-piem-elfeed): New variable. > * gnu/packages/emacs-xyz.scm (emacs-piem-eww): New variable. > * gnu/packages/emacs-xyz.scm (emacs-piem-gnus): New variable. > * gnu/packages/emacs-xyz.scm (emacs-piem-notmuch): New variable. > * gnu/packages/emacs-xyz.scm (emacs-piem-rmail): New variable. > * gnu/packages/emacs-xyz.scm (emacs-piem-lei): New variable. > --- > gnu/packages/emacs-xyz.scm | 139 +++++++++++++++++++++++++++++-------- > 1 file changed, 109 insertions(+), 30 deletions(-) > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index bc56067a7c..3f62e92116 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -7134,45 +7134,124 @@ (define-public emacs-piem > (package > (name "emacs-piem") > (version "0.4.0") > - (source > - (origin > - (method git-fetch) > - (uri (git-reference > - (url "https://git.kyleam.com/piem") > - (commit (string-append "v" version)))) > - (file-name (string-append name "-" version "-checkout")) > - (sha256 > - (base32 "0wr6n6wvznngjdp4c0pmdr4xz05dark0kxi5svzhzxsg3rdaql3z"))= )) > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://git.kyleam.com/piem") > + (commit (string-append "v" version)))) > + (file-name (string-append name "-" version "-checkout")) > + (sha256 > + (base32 > + "0wr6n6wvznngjdp4c0pmdr4xz05dark0kxi5svzhzxsg3rdaql3z"))= )) > (build-system emacs-build-system) > (arguments > - (list #:phases > - #~(modify-phases %standard-phases > - (add-after 'unpack 'configure > - (lambda* (#:key inputs #:allow-other-keys) > - (emacs-substitute-variables "piem-b4.el" > - ("piem-b4-b4-executable" > - (search-input-file inputs "/bin/b4"))))) > - (add-after 'unpack 'build-info-manual > - (lambda _ > - (invoke "make" "Documentation/piem.info") > - (rename-file "Documentation/piem.info" "piem.info")))= ))) > - (inputs > - (list b4)) > - (native-inputs > - (list texinfo)) > - (propagated-inputs > - (list emacs-elfeed > - emacs-notmuch > - emacs-transient)) > - (home-page "https://docs.kyleam.com/piem") > + (list #:exclude #~(cons* "^piem-b4.el" > + "^piem-elfeed.el" > + "^piem-eww.el" > + "^piem-gnus.el" > + "^piem-lei.el" > + "^piem-notmuch.el" > + "^piem-rmail.el" > + %default-exclude) > + #:phases #~(modify-phases %standard-phases > + (add-after 'unpack 'build-info-manual > + (lambda _ > + (invoke "make" "Documentation/piem.info") > + (rename-file "Documentation/piem.info" "piem= .info")))))) > + (native-inputs (list texinfo)) > + (propagated-inputs (list emacs-transient)) > + (home-page "https://docs.kyleam.com/piem/") > (synopsis "Glue for working with public-inbox archives") > - (description "This packages provides a collection of Emacs libraries= for > + (description > + "This package provides a collection of Emacs libraries for > working with public-inbox archives. As much of the hard work here is al= ready > done by other Emacs libraries=E2=80=94things like mail clients, news rea= ders, Git > interfaces, and even web browsers=E2=80=94piem is mostly about bridging = some of these > parts for convenience.") > (license license:gpl3+))) >=20=20 > +(define-public emacs-piem-b4 > + (package > + (inherit emacs-piem) > + (name "emacs-piem-b4") > + (inputs (list b4)) > + (propagated-inputs (list emacs-piem)) > + (arguments > + (list #:include #~(list "piem-b4.el") > + #:phases #~(modify-phases %standard-phases > + (add-after 'unpack 'configure > + (lambda* (#:key inputs #:allow-other-keys) > + (emacs-substitute-variables "piem-b4.el" > + ("piem-b4-b4-exe= cutable" > + (search-input-f= ile > + inputs "/bin/b= 4")))))))) > + (synopsis "Emacs interface to the b4 tool") > + (description > + "This library provides a @code{emacs-transient} interface to @code{= b4}. It is > +documented in the piem manual."))) > + > +(define-public emacs-piem-elfeed > + (package > + (inherit emacs-piem) > + (name "emacs-piem-elfeed") > + (propagated-inputs (list emacs-piem emacs-elfeed)) > + (arguments > + (list #:include #~(list "piem-elfeed.el"))) > + (synopsis "Elfeed integration for piem") > + (description > + "This library provides @code{emacs-elfeed} integration for @code{pi= em}."))) > + > +(define-public emacs-piem-eww > + (package > + (inherit emacs-piem) > + (name "emacs-piem-eww") > + (propagated-inputs (list emacs-piem)) > + (arguments > + (list #:include #~(list "piem-eww.el"))) > + (synopsis "EWW integration for piem") > + (description "This library provides EWW integration for @code{piem}.= "))) > + > +(define-public emacs-piem-gnus > + (package > + (inherit emacs-piem) > + (name "emacs-piem-gnus") > + (propagated-inputs (list emacs-piem)) > + (arguments > + (list #:include #~(list "piem-gnus.el"))) > + (synopsis "Gnus integration for piem") > + (description "This library provides Gnus integration for @code{piem}= ."))) > + > +(define-public emacs-piem-notmuch > + (package > + (inherit emacs-piem) > + (name "emacs-piem-notmuch") > + (propagated-inputs (list emacs-piem emacs-notmuch)) > + (arguments > + (list #:include #~(list "piem-notmuch.el"))) > + (synopsis "Notmuch integration for piem") > + (description > + "This library provides @code{emacs-notmuch} integration for @code{p= iem}."))) > + > +(define-public emacs-piem-rmail > + (package > + (inherit emacs-piem) > + (name "emacs-piem-rmail") > + (propagated-inputs (list emacs-piem)) > + (arguments > + (list #:include #~(list "piem-rmail.el"))) > + (synopsis "Rmail integration for piem") > + (description "This library provides Rmail integration for @code{piem= }."))) > + > +(define-public emacs-piem-lei > + (package > + (inherit emacs-piem) > + (name "emacs-piem-lei") > + (propagated-inputs (list emacs-piem)) > + (arguments > + (list #:include #~(list "piem-lei.el"))) > + (synopsis "Lei integration for piem") > + (description "This library provides lei integration for @code{piem}.= "))) > + > (define-public emacs-ert-expectations > (package > (name "emacs-ert-expectations") > --=20 > 2.38.0 > > 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 wou= ld > avoid pulling unnecessary dependencies into user profile. > > * gnu/packages/emacs-xyz.scm (emacs-git-email): Split into multiple separ= ated > 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.")))) >=20=20 > +(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") > --=20 > 2.38.0 Hey, Niklas Eklund and zimoun Since you are the original contributors to =3Demacs-git-email=3D and =3Demacs-piem=3D. Here are some changes you may need to be aware of. I've split the package into multiple separate packages. So the user wants =3Dgit-email-notmuch=3D or =3Dpiem-notmuch=3D don't have to populate there home environment with =3Dmu=3D and other dependencies. Can you kindly review the changes, and give your thoughts on them? Thanks --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHLBAEBCAA1FiEE9pXznsYl4IEztXWfD8aHA3Xv4vUFAmNXOMgXHGRlY2xhbnRz aWVuQHJpc2V1cC5uZXQACgkQD8aHA3Xv4vUD2wv9GPPzQPC5wmXHrBXzMrbPIm1f MjcaGd+PTkaqyGpV/PMtWf9yRi6qohuLj8tRxPh1F39rfbAiL+VFJ25j/zw321of uu2iPJZ1V1akOT522YQpe2xRPuxNbYeGPhxeKqIvWb/U4qP/f4my4A3uwlRwO5pg QadOgqmEQApMxnWmFLTh9/FBbiQpwxi9AymipavvMfSL8z5ZywtPc8WHMmKnrcKm b8penKChQAzF7yDquQJosEjh7n6RZc3S5ktJofPNw0rYiwH6F5sdHjlAwUWQnrEN fqMsnem4P0daPljF92myvyxGGDvOc/5jEr6qPHDuQeE0mUqFCa1aLRC5mdkI9hkG jicQIIZG0ohjQcyPlU/XsvzQrjldLBdp3QOS23cG+E3U3woUvyiMVETqD7VhXMmf 8fPn9/9En+vzlF8z/w0MXGyuQ+GHDMBuCFJooyaD5d0cVeiYkTAbmocghiw3htbr DM53SnUzPJM9L8uuBx1PGT8XYm+R7iDfqF1Xyo5c =fhVW -----END PGP SIGNATURE----- --=-=-=-- From unknown Tue Jun 17 01:48:51 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Declan Tsien Subject: bug#58730: closed (Re: [bug#58730] [PATCH] Split emacs-piem and emacs-git-email) Message-ID: References: <87v8o3h0wk.fsf@riseup.net> <87r0yzks1p.fsf@riseup.net> X-Gnu-PR-Message: they-closed 58730 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 58730@debbugs.gnu.org Date: Sat, 29 Oct 2022 01:31:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1667007062-3840-1" This is a multi-part message in MIME format... ------------=_1667007062-3840-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #58730: [PATCH] Split emacs-piem and emacs-git-email which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 58730@debbugs.gnu.org. --=20 58730: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D58730 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1667007062-3840-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 58730-done) by debbugs.gnu.org; 29 Oct 2022 01:30:40 +0000 Received: from localhost ([127.0.0.1]:34612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooagJ-0000zI-Ud for submit@debbugs.gnu.org; Fri, 28 Oct 2022 21:30:40 -0400 Received: from mx1.riseup.net ([198.252.153.129]:46804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooagH-0000z3-9r for 58730-done@debbugs.gnu.org; Fri, 28 Oct 2022 21:30:37 -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 4MzhgW3vv8zDqQZ for <58730-done@debbugs.gnu.org>; Sat, 29 Oct 2022 01:30:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1667007031; bh=4iioUP8bv2X7+n/HGGLr4BP8Am2dAynUpj3vP+Ab2Vo=; h=From:To:Subject:In-Reply-To:References:Date:From; b=iE3pUy1ntRhZ+sIUTFf2t8KnrdSJBDGFNZ33uQQogw/ZDVoy/WxAGNbFtu4zI5kD6 YPyPfk6SCg3vbNmvM/vfMEU78o1+E7nYr68HY6/63NBuPHaHjaTWHYFlo1eYKvVMtv KF03/hXLW/h1EC4l1zrFZOyzmNNmuk5sJTxh2g8Y= X-Riseup-User-ID: 7DB15FC9851F6D5E2743DD6266920AC7B112EDD08966DF99295F38059503EADD Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4MzhgV6p71z5vXG for <58730-done@debbugs.gnu.org>; Sat, 29 Oct 2022 01:30:30 +0000 (UTC) From: Declan Tsien To: 58730-done@debbugs.gnu.org Subject: Re: [bug#58730] [PATCH] Split emacs-piem and emacs-git-email In-Reply-To: <87r0yzks1p.fsf@riseup.net> References: <87r0yzks1p.fsf@riseup.net> Date: Sat, 29 Oct 2022 09:30:19 +0800 Message-ID: <87v8o3h0wk.fsf@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 58730-done 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 (-) --=-=-= Content-Type: text/plain No Feedback. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHLBAEBCAA1FiEE9pXznsYl4IEztXWfD8aHA3Xv4vUFAmNcgisXHGRlY2xhbnRz aWVuQHJpc2V1cC5uZXQACgkQD8aHA3Xv4vWU4Qv/WNaPn+X5Stc//nwBLjXzmMaB oRf6ERg/tr2BNexqqhWro7Py4B/5cdauzF14tqht4G/eNpmjHmjTaQJ3n0HHX5OU XjOOC1nZUycImEPbEpbDeNOkANEnMNzeAEq8ixaDHkjwDvPF+dYAL23Rzp9icEhN 29/xqeyQNEad2FH8eLtLd4qL8Bz0kcn6Wt7cXidsDDgqLfdN9M4C0R5aQa3q8W+t f9al0y5qXCodXI6gLzL0pzxzYFGFsm8wmSKbDnJ/f4oXliJytXS0cu/jhx8JS2Dy LvHQuDaAaGI9rP8YVdL0zhFuyKfFpy0C8vckFY5fAHTSpTGUo+UGU70o6iFErVkx d+Ek2wv1tcPLZ8J6LJbfzjQx/YZq63+bxzwClhTlaABO2wsTGWrNyYLfDaiX2Viz 2kY2GKqowAjF2ZTj4UDKafPJ6CK/iHf8DGgbR/vqhNuJUNkoxM1U9/HlutCdlr9v /r6JkeZ7CCx8Fnmp218PyjxjCmdfkVd2eiOat6/d =Y9bL -----END PGP SIGNATURE----- --=-=-=-- ------------=_1667007062-3840-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org Subject: [PATCH] Split emacs-piem and emacs-git-email Date: Sun, 23 Oct 2022 13:49:54 +0800 Message-ID: <87r0yzks1p.fsf@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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-Spam-Score: -1.4 (-) 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.4 (--) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-emacs-git-email-Fix-makeinfo.patch Content-Transfer-Encoding: quoted-printable From=206b44b4998369f01365c0ddb1b935072cfefcbe1b Mon Sep 17 00:00:00 2001 From: Declan Tsien Date: Sun, 23 Oct 2022 11:40:07 +0800 Subject: [PATCH 1/4] gnu: emacs-git-email: Fix makeinfo. * gnu/packages/emacs-xyz.scm (emacs-git-email): Fix makeinfo. =2D-- gnu/packages/emacs-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 06ec9dd904..be6d4c6ba3 100644 =2D-- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17341,7 +17341,8 @@ (define-public emacs-git-email (delete-file "git-email-piem.el"))) (add-before 'install 'makeinfo (lambda _ =2D (invoke "makeinfo" "doc/git-email.texi")))))) + (invoke "make" "doc/git-email.info") + (rename-file "doc/git-email.info" "git-email.info")))))) (native-inputs (list texinfo)) (propagated-inputs base-commit: 1f734a6f0a7db5b0e12091a0c869c5c4810ac80e =2D-=20 2.38.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-emacs-piem-Add-build-info-manual-phase.patch Content-Transfer-Encoding: quoted-printable From=203d6c28a0cbeed2f38d91cd31155a257578675f6d Mon Sep 17 00:00:00 2001 From: Declan Tsien Date: Sun, 23 Oct 2022 11:42:19 +0800 Subject: [PATCH 2/4] gnu: emacs-piem: Add build-info-manual phase. * gnu/packages/emacs-xyz.scm (emacs-piem): Add build-info-manual phase. [native-inputs]: Add texinfo. =2D-- gnu/packages/emacs-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index be6d4c6ba3..bc56067a7c 100644 =2D-- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7151,9 +7151,15 @@ (define-public emacs-piem (lambda* (#:key inputs #:allow-other-keys) (emacs-substitute-variables "piem-b4.el" ("piem-b4-b4-executable" =2D (search-input-file inputs "/bin/b4")))))))) + (search-input-file inputs "/bin/b4"))))) + (add-after 'unpack 'build-info-manual + (lambda _ + (invoke "make" "Documentation/piem.info") + (rename-file "Documentation/piem.info" "piem.info")))))) (inputs (list b4)) + (native-inputs + (list texinfo)) (propagated-inputs (list emacs-elfeed emacs-notmuch =2D-=20 2.38.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0003-gnu-emacs-piem-Split-into-multiple-separated-package.patch Content-Transfer-Encoding: quoted-printable From=20ff45839e29bad8bd4fa5d9b4868b3f68fe8d300d Mon Sep 17 00:00:00 2001 From: Declan Tsien Date: Sun, 23 Oct 2022 11:46:37 +0800 Subject: [PATCH 3/4] gnu: emacs-piem: Split into multiple separated package= s. emacs-piem currently bundles multiple lisp files with identical functionali= ty but for different tastes. Split into separated packages would avoid pulling unnecessary dependencies into user profile. * gnu/packages/emacs-xyz.scm (emacs-piem): Split into multiple separated packages. * gnu/packages/emacs-xyz.scm (emacs-piem-b4): New variable. * gnu/packages/emacs-xyz.scm (emacs-piem-elfeed): New variable. * gnu/packages/emacs-xyz.scm (emacs-piem-eww): New variable. * gnu/packages/emacs-xyz.scm (emacs-piem-gnus): New variable. * gnu/packages/emacs-xyz.scm (emacs-piem-notmuch): New variable. * gnu/packages/emacs-xyz.scm (emacs-piem-rmail): New variable. * gnu/packages/emacs-xyz.scm (emacs-piem-lei): New variable. =2D-- gnu/packages/emacs-xyz.scm | 139 +++++++++++++++++++++++++++++-------- 1 file changed, 109 insertions(+), 30 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bc56067a7c..3f62e92116 100644 =2D-- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7134,45 +7134,124 @@ (define-public emacs-piem (package (name "emacs-piem") (version "0.4.0") =2D (source =2D (origin =2D (method git-fetch) =2D (uri (git-reference =2D (url "https://git.kyleam.com/piem") =2D (commit (string-append "v" version)))) =2D (file-name (string-append name "-" version "-checkout")) =2D (sha256 =2D (base32 "0wr6n6wvznngjdp4c0pmdr4xz05dark0kxi5svzhzxsg3rdaql3z"))= )) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kyleam.com/piem") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0wr6n6wvznngjdp4c0pmdr4xz05dark0kxi5svzhzxsg3rdaql3z")))) (build-system emacs-build-system) (arguments =2D (list #:phases =2D #~(modify-phases %standard-phases =2D (add-after 'unpack 'configure =2D (lambda* (#:key inputs #:allow-other-keys) =2D (emacs-substitute-variables "piem-b4.el" =2D ("piem-b4-b4-executable" =2D (search-input-file inputs "/bin/b4"))))) =2D (add-after 'unpack 'build-info-manual =2D (lambda _ =2D (invoke "make" "Documentation/piem.info") =2D (rename-file "Documentation/piem.info" "piem.info")))= ))) =2D (inputs =2D (list b4)) =2D (native-inputs =2D (list texinfo)) =2D (propagated-inputs =2D (list emacs-elfeed =2D emacs-notmuch =2D emacs-transient)) =2D (home-page "https://docs.kyleam.com/piem") + (list #:exclude #~(cons* "^piem-b4.el" + "^piem-elfeed.el" + "^piem-eww.el" + "^piem-gnus.el" + "^piem-lei.el" + "^piem-notmuch.el" + "^piem-rmail.el" + %default-exclude) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'build-info-manual + (lambda _ + (invoke "make" "Documentation/piem.info") + (rename-file "Documentation/piem.info" "piem.i= nfo")))))) + (native-inputs (list texinfo)) + (propagated-inputs (list emacs-transient)) + (home-page "https://docs.kyleam.com/piem/") (synopsis "Glue for working with public-inbox archives") =2D (description "This packages provides a collection of Emacs libraries= for + (description + "This package provides a collection of Emacs libraries for working with public-inbox archives. As much of the hard work here is alre= ady done by other Emacs libraries=E2=80=94things like mail clients, news reade= rs, Git interfaces, and even web browsers=E2=80=94piem is mostly about bridging so= me of these parts for convenience.") (license license:gpl3+))) =20 +(define-public emacs-piem-b4 + (package + (inherit emacs-piem) + (name "emacs-piem-b4") + (inputs (list b4)) + (propagated-inputs (list emacs-piem)) + (arguments + (list #:include #~(list "piem-b4.el") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (emacs-substitute-variables "piem-b4.el" + ("piem-b4-b4-execu= table" + (search-input-file + inputs "/bin/b4"= )))))))) + (synopsis "Emacs interface to the b4 tool") + (description + "This library provides a @code{emacs-transient} interface to @code{b4= }. It is +documented in the piem manual."))) + +(define-public emacs-piem-elfeed + (package + (inherit emacs-piem) + (name "emacs-piem-elfeed") + (propagated-inputs (list emacs-piem emacs-elfeed)) + (arguments + (list #:include #~(list "piem-elfeed.el"))) + (synopsis "Elfeed integration for piem") + (description + "This library provides @code{emacs-elfeed} integration for @code{piem= }."))) + +(define-public emacs-piem-eww + (package + (inherit emacs-piem) + (name "emacs-piem-eww") + (propagated-inputs (list emacs-piem)) + (arguments + (list #:include #~(list "piem-eww.el"))) + (synopsis "EWW integration for piem") + (description "This library provides EWW integration for @code{piem}.")= )) + +(define-public emacs-piem-gnus + (package + (inherit emacs-piem) + (name "emacs-piem-gnus") + (propagated-inputs (list emacs-piem)) + (arguments + (list #:include #~(list "piem-gnus.el"))) + (synopsis "Gnus integration for piem") + (description "This library provides Gnus integration for @code{piem}."= ))) + +(define-public emacs-piem-notmuch + (package + (inherit emacs-piem) + (name "emacs-piem-notmuch") + (propagated-inputs (list emacs-piem emacs-notmuch)) + (arguments + (list #:include #~(list "piem-notmuch.el"))) + (synopsis "Notmuch integration for piem") + (description + "This library provides @code{emacs-notmuch} integration for @code{pie= m}."))) + +(define-public emacs-piem-rmail + (package + (inherit emacs-piem) + (name "emacs-piem-rmail") + (propagated-inputs (list emacs-piem)) + (arguments + (list #:include #~(list "piem-rmail.el"))) + (synopsis "Rmail integration for piem") + (description "This library provides Rmail integration for @code{piem}.= "))) + +(define-public emacs-piem-lei + (package + (inherit emacs-piem) + (name "emacs-piem-lei") + (propagated-inputs (list emacs-piem)) + (arguments + (list #:include #~(list "piem-lei.el"))) + (synopsis "Lei integration for piem") + (description "This library provides lei integration for @code{piem}.")= )) + (define-public emacs-ert-expectations (package (name "emacs-ert-expectations") =2D-=20 2.38.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-emacs-git-email-Split-into-multiple-separated-pa.patch Content-Transfer-Encoding: quoted-printable From=20d0c79a8c055c3818c1ea97e4cf0aa373303025e5 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 separat= ed 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. =2D-- 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 =2D-- 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)) =2D (source =2D (origin =2D (method git-fetch) =2D (uri (git-reference =2D (url "https://git.sr.ht/~yoctocell/git-email") =2D (commit commit))) =2D (patches =2D (search-patches "emacs-git-email-missing-parens.patch")) =2D (file-name (git-file-name name version)) =2D (sha256 =2D (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 =2D `(#:phases =2D (modify-phases %standard-phases =2D ;; piem is not yet packaged in Guix. =2D (add-after 'unpack 'remove-piem =2D (lambda _ =2D (delete-file "git-email-piem.el"))) =2D (add-before 'install 'makeinfo =2D (lambda _ =2D (invoke "make" "doc/git-email.info") =2D (rename-file "doc/git-email.info" "git-email.info")))))) =2D (native-inputs =2D (list texinfo)) =2D (propagated-inputs =2D (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.")))) =20 +(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-m= issing-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") =2D-=20 2.38.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHLBAEBCAA1FiEE9pXznsYl4IEztXWfD8aHA3Xv4vUFAmNU1gIXHGRlY2xhbnRz aWVuQHJpc2V1cC5uZXQACgkQD8aHA3Xv4vW1rgwAqYRb2u32Itg/dn9G0OjVIzpL GGGqMYH4gCv+8TIzQ8/eNnIEdqJBvVo1rYC8+lTtv+6WuQJHd4KFgR7DzAE6USYV UfLWXKmiT1+mVTdFb6gzbGUiBVe5hYn7VwDIHiVDTgkpCP/AbHXFD32B02ytraSl xIvG0W8wOJMo7X8va1OwdkC+HLdpTUrCM+4hdgcxcUjXbfkx9Db3wCMx/Jt3yXuZ TNey3KmX95kYELJnIkFnIZDKTKCNQd5AoGy93CRmL74Sg1vqg64A1BGuR0Zi7PvW eT4kx2ccG69Wdq+Y+zvoIttKnI5B1krpcfy8D3Bfk+JmrrgCZLpERtVmzgjZ4RRj X0EaEiSKQT8onAtD8xO/xXILMMmzUKLQPxQVzRHAyisC4x2+mCm7JibRwaWE6g7c X1Ovl3upvWAfg1FFulKwq+33lT+jl7JTffAO+WzaZm4URFTT2NC3CLzIgtihgb2I myx26kEiri6C9TjEjcLB647wZYTOuTibwPT9F9Qu =xeOK -----END PGP SIGNATURE----- --==-=-=-- ------------=_1667007062-3840-1-- From unknown Tue Jun 17 01:48:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#58730] [PATCH] Split emacs-piem and emacs-git-email Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Nov 2022 18:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Declan Tsien , 58730@debbugs.gnu.org Cc: Kyle Meyer , public@yoctocell.xyz, liliana.prikler@gmail.com, Nicolas Goaziou , Andrew Tropin Received: via spool by 58730-submit@debbugs.gnu.org id=B58730.166741354723500 (code B ref 58730); Wed, 02 Nov 2022 18:26:03 +0000 Received: (at 58730) by debbugs.gnu.org; 2 Nov 2022 18:25:47 +0000 Received: from localhost ([127.0.0.1]:47173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oqIQs-00066x-Ln for submit@debbugs.gnu.org; Wed, 02 Nov 2022 14:25:47 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:39677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oqIQp-00066C-V8 for 58730@debbugs.gnu.org; Wed, 02 Nov 2022 14:25:45 -0400 Received: by mail-wr1-f47.google.com with SMTP id o4so25782125wrq.6 for <58730@debbugs.gnu.org>; Wed, 02 Nov 2022 11:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ir4r/MCmgUpUSFEi/PdIOAsawQMjJUl7sHJjCCyq7Ws=; b=kBsAj5OSrIAvbWYL8B8nUnoDKiqyUK2ncqwxFrt2kLAxbhON/Al+/BCQOsLtNJVCir My6MjJzwHzVO3UJYvC17I7W2c4CJNj54h3Ymcq6GqRGwnRgvb2FCKtPlG+vV8BCQ0+gL rMNNkfvf9GRFkpEnx2RwTzCfXlpDCClZ/Ncv3MbJw1ISqIuZh86UoYBGAssik9QrIdbI qKBgMAzvDWL6jlWkrbUr6aIeHsVgNVbBH/SwSHRNonr+zzVNVJuRhiqQewAjfHJiKdWl E7Koi6I9Djk87yj1zeu1y+uphc5ctrMqLgXJz9UomwMgpoJjOuaWV30F4lONPY7omN/f /Q0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ir4r/MCmgUpUSFEi/PdIOAsawQMjJUl7sHJjCCyq7Ws=; b=V7tvkM/to1mscOAwBi0zsgLrHMY8ThadV9XrSEyl9Mkuk0+729bP3vUohAMELqGWlh bOZ8DSvagFDfpyopo3hJxTeaxan4e56OdRRdQeFeIayJAL4DfMJBoY9eO/gwY9SGcSa5 zlzxOkjkf8SV5xPoGrMN7uBDc56eWIKLd+W0D7po1UTjgQ/PWvwmisFGr9JvvYb6q6tc gq4rV2SBnCKaRU4IqQGTCb6LbJSFjkKMnGE2uIiUA5qk0PEDQSjsVd8oDQGYFiU089Q/ WLm99NuwucskZNE17g9b1hx3sWOgAOf9gaNfcJiuhga+JtUL0mF2yEy2ptVJrQS0xAO9 K1JQ== X-Gm-Message-State: ACrzQf2Ad/D+mVmOxGol9X2i0oqx3Eozgaa/KWmcxAeWMffzEhRbLqSt JkAqH4zr+s6h+jwfb10nJdA= X-Google-Smtp-Source: AMsMyM6WrFN8kwBwveOWHM625HBx1X3c/DZYehX2bdmakN7Aas28nchFbEHpaiDPw+3LF4hBHusnew== X-Received: by 2002:adf:f081:0:b0:236:5e7c:4ec2 with SMTP id n1-20020adff081000000b002365e7c4ec2mr15704179wro.641.1667413538098; Wed, 02 Nov 2022 11:25:38 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id h17-20020adfe991000000b0023657e1b980sm13261743wrm.53.2022.11.02.11.25.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 11:25:37 -0700 (PDT) From: zimoun In-Reply-To: <87r0yzks1p.fsf@riseup.net> References: <87r0yzks1p.fsf@riseup.net> Date: Wed, 02 Nov 2022 19:13:28 +0100 Message-ID: <87leotb4xj.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.5 (/) 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: -0.5 (/) Hi, CC: emacs team Kyle, are all the sub-packages of piem working independently? Xinglu, are all the sub-packages of emacs-git-email working independently? On dim., 23 oct. 2022 at 13:49, Declan Tsien wrote: > Subject: [PATCH 1/4] gnu: emacs-git-email: Fix makeinfo. > > * gnu/packages/emacs-xyz.scm (emacs-git-email): Fix makeinfo. > --- > gnu/packages/emacs-xyz.scm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) LGTM. > Subject: [PATCH 2/4] gnu: emacs-piem: Add build-info-manual phase. > > * gnu/packages/emacs-xyz.scm (emacs-piem): Add build-info-manual phase. > [native-inputs]: Add texinfo. > --- > gnu/packages/emacs-xyz.scm | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index be6d4c6ba3..bc56067a7c 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -7151,9 +7151,15 @@ (define-public emacs-piem > (lambda* (#:key inputs #:allow-other-keys) > (emacs-substitute-variables "piem-b4.el" > ("piem-b4-b4-executable" > - (search-input-file inputs "/bin/b4")))))))) > + (search-input-file inputs "/bin/b4"))))) > + (add-after 'unpack 'build-info-manual > + (lambda _ > + (invoke "make" "Documentation/piem.info") > + (rename-file "Documentation/piem.info" "piem.info")))= ))) Here, I would build the manual before the install phase instead after the unpack phase. > Subject: [PATCH 3/4] gnu: emacs-piem: Split into multiple separated packa= ges. > > emacs-piem currently bundles multiple lisp files with identical functiona= lity > but for different tastes. Split into separated packages would avoid pulli= ng > unnecessary dependencies into user profile. > > * gnu/packages/emacs-xyz.scm (emacs-piem): Split into multiple separated > packages. > * gnu/packages/emacs-xyz.scm (emacs-piem-b4): New variable. > * gnu/packages/emacs-xyz.scm (emacs-piem-elfeed): New variable. > * gnu/packages/emacs-xyz.scm (emacs-piem-eww): New variable. > * gnu/packages/emacs-xyz.scm (emacs-piem-gnus): New variable. > * gnu/packages/emacs-xyz.scm (emacs-piem-notmuch): New variable. > * gnu/packages/emacs-xyz.scm (emacs-piem-rmail): New variable. > * gnu/packages/emacs-xyz.scm (emacs-piem-lei): New variable. Personally, I am fine with several packages. But we could also ask if several output would not fit the bill. WDYT? > --- > gnu/packages/emacs-xyz.scm | 139 +++++++++++++++++++++++++++++-------- > 1 file changed, 109 insertions(+), 30 deletions(-) > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index bc56067a7c..3f62e92116 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -7134,45 +7134,124 @@ (define-public emacs-piem > (package > (name "emacs-piem") > (version "0.4.0") > - (source > - (origin > - (method git-fetch) > - (uri (git-reference > - (url "https://git.kyleam.com/piem") > - (commit (string-append "v" version)))) > - (file-name (string-append name "-" version "-checkout")) > - (sha256 > - (base32 "0wr6n6wvznngjdp4c0pmdr4xz05dark0kxi5svzhzxsg3rdaql3z"))= )) > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://git.kyleam.com/piem") > + (commit (string-append "v" version)))) > + (file-name (string-append name "-" version "-checkout")) > + (sha256 > + (base32 > + "0wr6n6wvznngjdp4c0pmdr4xz05dark0kxi5svzhzxsg3rdaql3z"))= )) Why this cosmetic change? > (build-system emacs-build-system) > (arguments > - (list #:phases > - #~(modify-phases %standard-phases > - (add-after 'unpack 'configure > - (lambda* (#:key inputs #:allow-other-keys) > - (emacs-substitute-variables "piem-b4.el" > - ("piem-b4-b4-executable" > - (search-input-file inputs "/bin/b4"))))) > - (add-after 'unpack 'build-info-manual > - (lambda _ > - (invoke "make" "Documentation/piem.info") > - (rename-file "Documentation/piem.info" "piem.info")))= ))) > - (inputs > - (list b4)) > - (native-inputs > - (list texinfo)) > - (propagated-inputs > - (list emacs-elfeed > - emacs-notmuch > - emacs-transient)) > - (home-page "https://docs.kyleam.com/piem") > + (list #:exclude #~(cons* "^piem-b4.el" > + "^piem-elfeed.el" > + "^piem-eww.el" > + "^piem-gnus.el" > + "^piem-lei.el" > + "^piem-notmuch.el" > + "^piem-rmail.el" > + %default-exclude) > + #:phases #~(modify-phases %standard-phases > + (add-after 'unpack 'build-info-manual > + (lambda _ > + (invoke "make" "Documentation/piem.info") > + (rename-file "Documentation/piem.info" "piem= .info")))))) LGTM. > + (native-inputs (list texinfo)) Why this cosmetic change? > + (propagated-inputs (list emacs-transient)) > + (home-page "https://docs.kyleam.com/piem/") > (synopsis "Glue for working with public-inbox archives") > - (description "This packages provides a collection of Emacs libraries= for > + (description > + "This package provides a collection of Emacs libraries for Idem. =20=20 > +(define-public emacs-piem-b4 [...] > +(define-public emacs-piem-elfeed [...] > +(define-public emacs-piem-eww [...] > +(define-public emacs-piem-gnus [...] > +(define-public emacs-piem-notmuch [...] > +(define-public emacs-piem-rmail [...] > +(define-public emacs-piem-lei [...] All LGTM although I have not checked if all packages are working independently. --8<---------------cut here---------------start------------->8--- $ ./pre-inst-env guix build $(./pre-inst-env guix search emacs-piem | recse= l -CP name) --no-grafts /gnu/store/15gghkyq9wr2qjnlxnq5pb9k5cggcyzv-emacs-git-email-piem-0.2.0-0.b5= ebade /gnu/store/hqdv1hc8vdcym59dzfyp9s49sbjzsa37-emacs-piem-b4-0.4.0 /gnu/store/p0f8q5swvb16w3f8709643gm6f7pj6wn-emacs-piem-elfeed-0.4.0 /gnu/store/1abb0k30igcyg2vgi3w6hnmszkx1yxmc-emacs-piem-eww-0.4.0 /gnu/store/8v2vn6qdiza1lj19frf1flb7h3s3r1s3-emacs-piem-gnus-0.4.0 /gnu/store/18pbym3hwyg8m2arnin58r3vyrx4f781-emacs-piem-lei-0.4.0 /gnu/store/qsibcac82cls2r2jvnxkvc1iajja5mqg-emacs-piem-notmuch-0.4.0 /gnu/store/s6xzxjy7wsi7q5c50qxvg7mbmz1i10v0-emacs-piem-rmail-0.4.0 /gnu/store/zyy8c2q56299s510lndzmi0lk26m4wh6-emacs-piem-0.4.0 --8<---------------cut here---------------end--------------->8--- > 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 wou= ld > avoid pulling unnecessary dependencies into user profile. > > * gnu/packages/emacs-xyz.scm (emacs-git-email): Split into multiple separ= ated > 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"= )))) Idem about cosmetic change? The rest LGTM. > +(define-public emacs-git-email-gnus [...] > +(define-public emacs-git-email-magit [...] > +(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"))))) Usually, =E2=80=99match=E2=80=99 is preferred over =E2=80=99car=E2=80=99; f= or instance, ,(match (search-patches "emacs-git-email-missing-parens.patch") ((head tail ...) head)) > +(define-public emacs-git-email-notmuch [...] > +(define-public emacs-git-email-piem [...] All LGTM although I have not checked if all packages are working independently. --8<---------------cut here---------------start------------->8--- $ ./pre-inst-env guix build $(./pre-inst-env guix search emacs-git-email | = recsel -CP name)=20 /gnu/store/qpll3r2mj17klmlij939fd576zzspnyp-emacs-git-email-gnus-0.2.0-0.b5= ebade /gnu/store/aw7v8mwgnk8qf2mhwzsrp4y38b35yl98-emacs-git-email-magit-0.2.0-0.b= 5ebade /gnu/store/w84d3c2w6r1f1jk0izz72kgz9p2942ab-emacs-git-email-mu4e-0.2.0-0.b5= ebade /gnu/store/saw1nnjsn8j5kxmnrnnbn2zqp9hs7iv2-emacs-git-email-notmuch-0.2.0-0= .b5ebade /gnu/store/15gghkyq9wr2qjnlxnq5pb9k5cggcyzv-emacs-git-email-piem-0.2.0-0.b5= ebade /gnu/store/kl1q1kc140v8kmx4g4564z3nx83vm5h7-emacs-git-email-0.2.0-0.b5ebade --8<---------------cut here---------------end--------------->8--- Cheers, simon From unknown Tue Jun 17 01:48:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#58730] [PATCH] Split emacs-piem and emacs-git-email Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Nov 2022 05:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: zimoun Cc: Declan Tsien , public@yoctocell.xyz, liliana.prikler@gmail.com, Andrew Tropin , 58730@debbugs.gnu.org, Nicolas Goaziou Received: via spool by 58730-submit@debbugs.gnu.org id=B58730.166762572912184 (code B ref 58730); Sat, 05 Nov 2022 05:23:01 +0000 Received: (at 58730) by debbugs.gnu.org; 5 Nov 2022 05:22:09 +0000 Received: from localhost ([127.0.0.1]:55306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orBdB-0003AR-4i for submit@debbugs.gnu.org; Sat, 05 Nov 2022 01:22:09 -0400 Received: from out0.migadu.com ([94.23.1.103]:48895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orBd7-0003AD-Q1 for 58730@debbugs.gnu.org; Sat, 05 Nov 2022 01:22:07 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1667625723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=dIdo4kDSkTdKvjMIL03H2zWrfLG6nMdkRVaw9U1iIKk=; b=onfiDfWfBqCCMy0VTNfu62DMrB1xLEzcOf6gVZzVt39C1iTad9w4xp9VE8LsEqHNCXt4rM MMz60c4K5lIpMYfNER6tE1w/osSkP9JntcEcGP+7jqyAIOHfuRUTaM6cAbDGTlojseIcvm 08OK4loZmd5ryreYV3dhB4zi2mBmpv1UDzcWLU8Rd+O/EbUaS2wya6DA7f5s7eUqs0y955 boaJGMCHOdamHCGwSx1UlLL1QNd9Ecst7h0X4Y8Lt6RoF1S2vdZxPNflufO1U3wGw6cJ9B 7eQpnBAP10OBriOxUH+HGO8rN5wdUVjmgTZkow2SJwj2HWDKUMfKRXr3x8bD3Q== From: Kyle Meyer In-Reply-To: <87leotb4xj.fsf@gmail.com> References: <87r0yzks1p.fsf@riseup.net> <87leotb4xj.fsf@gmail.com> Date: Sat, 05 Nov 2022 01:22:01 -0400 Message-ID: <87bkpm2cxy.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain X-Migadu-Flow: FLOW_OUT X-Spam-Score: -0.7 (/) 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 (-) zimoun writes: > Kyle, are all the sub-packages of piem working independently? -elfeed, -eww, -gnus, -notmuch, and -rmail are integration libraries that, when their corresponding minor modes are enabled, wire themselves up to piem.el hooks. None of these libraries depend on each other, and piem.el doesn't depend on any of them being present. -lei is an integration library as well, though it's a bit more involved because it provides an interface to public-inbox's lei (mostly just `lei q' at the moment). piem.el does bind a piem-lei command in piem-dispatch, so that of course won't be found if piem-lei.el isn't present, but otherwise things should be functional. -b4 is a little different. It implements b4 support of course, but it's not an "integration library" like the ones referred to above. b4 is the main workhorse for applying patch series, regardless of whether that's from Gnus or Notmuch or whatnot. I know some people use piem.el without b4, and I'm glad if that works for their needs, but in my view b4 support is a core part of piem. > On dim., 23 oct. 2022 at 13:49, Declan Tsien wrote: [...] >> Subject: [PATCH 2/4] gnu: emacs-piem: Add build-info-manual phase. >> >> * gnu/packages/emacs-xyz.scm (emacs-piem): Add build-info-manual phase. >> [native-inputs]: Add texinfo. >> --- >> gnu/packages/emacs-xyz.scm | 8 +++++++- >> 1 file changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm >> index be6d4c6ba3..bc56067a7c 100644 >> --- a/gnu/packages/emacs-xyz.scm >> +++ b/gnu/packages/emacs-xyz.scm >> @@ -7151,9 +7151,15 @@ (define-public emacs-piem >> (lambda* (#:key inputs #:allow-other-keys) >> (emacs-substitute-variables "piem-b4.el" >> ("piem-b4-b4-executable" >> - (search-input-file inputs "/bin/b4")))))))) >> + (search-input-file inputs "/bin/b4"))))) >> + (add-after 'unpack 'build-info-manual >> + (lambda _ >> + (invoke "make" "Documentation/piem.info") >> + (rename-file "Documentation/piem.info" "piem.info")))))) > > Here, I would build the manual before the install phase instead after > the unpack phase. Declan, thanks, I appreciate you adding the manual. >> Subject: [PATCH 3/4] gnu: emacs-piem: Split into multiple separated packages. >> >> emacs-piem 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-piem): Split into multiple separated >> packages. >> * gnu/packages/emacs-xyz.scm (emacs-piem-b4): New variable. >> * gnu/packages/emacs-xyz.scm (emacs-piem-elfeed): New variable. >> * gnu/packages/emacs-xyz.scm (emacs-piem-eww): New variable. >> * gnu/packages/emacs-xyz.scm (emacs-piem-gnus): New variable. >> * gnu/packages/emacs-xyz.scm (emacs-piem-notmuch): New variable. >> * gnu/packages/emacs-xyz.scm (emacs-piem-rmail): New variable. >> * gnu/packages/emacs-xyz.scm (emacs-piem-lei): New variable. > > Personally, I am fine with several packages. But we could also ask if > several output would not fit the bill. WDYT? Yes, I also wondered about using multiple outputs instead. Two comments on "avoid[ing] pulling in unnecessary dependencies": * -eww, -gnus, and -rmail use libraries that ship with Emacs, so splitting them out doesn't remove any dependencies. * -lei doesn't bring in any dependencies because public-inbox isn't listed as an input. From unknown Tue Jun 17 01:48:51 2025 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: Sat, 05 Nov 2022 07:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: zimoun Cc: 58730@debbugs.gnu.org Received: via spool by 58730-submit@debbugs.gnu.org id=B58730.166763271328653 (code B ref 58730); Sat, 05 Nov 2022 07:19:02 +0000 Received: (at 58730) by debbugs.gnu.org; 5 Nov 2022 07:18:33 +0000 Received: from localhost ([127.0.0.1]:55365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orDRo-0007S5-HX for submit@debbugs.gnu.org; Sat, 05 Nov 2022 03:18:32 -0400 Received: from mx1.riseup.net ([198.252.153.129]:55868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orDRm-0007Rq-0P for 58730@debbugs.gnu.org; Sat, 05 Nov 2022 03:18:31 -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 4N483g5CWhzDqWS; Sat, 5 Nov 2022 07:18:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1667632703; bh=jEgJjzjYTHipa3k6+iqiWDoz2KuWKQj2GzvzIyCOx2w=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=g8+GgCEjOid+Litv+tdM3iwWl1pvHPX6HAeSmWtf+PZWM1G3mPbzG1BSmyN3UtarI /FYKgoSirjWo8lIQ3Y5ohQT3T7D+BRKgx3r/cl3VUo2SaaHdVjAbnGwSwgzOezOOW9 U66j8xtmQczzxP4vBePlgmH+buBIfQmgy9NeL1O4= X-Riseup-User-ID: 56762B833BE3573EA262E1E307124C0216E2AE615D7FEF7A4FA97B865E63160C Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4N483g0h2nz5vRX; Sat, 5 Nov 2022 07:18:22 +0000 (UTC) From: Declan Tsien In-Reply-To: <87leotb4xj.fsf@gmail.com> References: <87r0yzks1p.fsf@riseup.net> <87leotb4xj.fsf@gmail.com> Date: Sat, 05 Nov 2022 15:18:16 +0800 Message-ID: <87bkplc1jb.fsf@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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 (-) --=-=-= Content-Type: text/plain zimoun writes: >> --- >> gnu/packages/emacs-xyz.scm | 139 +++++++++++++++++++++++++++++-------- >> 1 file changed, 109 insertions(+), 30 deletions(-) >> >> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm >> index bc56067a7c..3f62e92116 100644 >> --- a/gnu/packages/emacs-xyz.scm >> +++ b/gnu/packages/emacs-xyz.scm >> @@ -7134,45 +7134,124 @@ (define-public emacs-piem >> (package >> (name "emacs-piem") >> (version "0.4.0") >> - (source >> - (origin >> - (method git-fetch) >> - (uri (git-reference >> - (url "https://git.kyleam.com/piem") >> - (commit (string-append "v" version)))) >> - (file-name (string-append name "-" version "-checkout")) >> - (sha256 >> - (base32 "0wr6n6wvznngjdp4c0pmdr4xz05dark0kxi5svzhzxsg3rdaql3z")))) >> + (source (origin >> + (method git-fetch) >> + (uri (git-reference >> + (url "https://git.kyleam.com/piem") >> + (commit (string-append "v" version)))) >> + (file-name (string-append name "-" version "-checkout")) >> + (sha256 >> + (base32 >> + "0wr6n6wvznngjdp4c0pmdr4xz05dark0kxi5svzhzxsg3rdaql3z")))) > > Why this cosmetic change? > I believe this change was made by =guix style= or =guix lint=. I am not sure. BTW, I am OK with the way it is now (bundled), I can easily decouple them in my guix-home configuration file. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHLBAEBCAA1FiEE9pXznsYl4IEztXWfD8aHA3Xv4vUFAmNmDjgXHGRlY2xhbnRz aWVuQHJpc2V1cC5uZXQACgkQD8aHA3Xv4vVGeQwAjiC0l50JjCTwQVRoFI23ReRl JPymCxbAzdP1MEbXaay92osdu9tL4GXPcjWrXovnBnRLJDBcer0DXovOlaSQVqw+ OPlKxL768uD8Pr3tfstyqRpzFqlKPrB89mZSObhP882XLfVQtZGJjCQPE2CMWBMb 4GUDxfl8gN7e6BEovrNIKqsyPNkkdenmzh/k0ha5j/G8XZQEWXSWbVYfGTE5uGX0 BJpvj03vrzSWLhGZw6mpqSXYDCRXpcz9Yahbk8aCn16SAZRltu+Ajghsc2VpvcEz 87tkci3Os1jt0mrJF55HCOOCmUvzPISmytmTefDW3WY7HseEGn3Xg37Rr+SA1bft wT8H4BVdjzn2GShzVubGZLxpAMk1jG+B0uVwteRRzY61YCalJQ9+Fw71KrSs6pue mXURkFkdr2up/UuB/QxtzFYaJHGLlMaLsMc5asj6AHOTyHLS8407S7EgyIGFmGW6 /2wzgIhccKDYM9vTF+quvy25gCaiEX1FmZU6Vl6s =7JdX -----END PGP SIGNATURE----- --=-=-=--