From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id QIUoNdO5YmNoVgAAbAwnHQ (envelope-from ) for ; Wed, 02 Nov 2022 19:41:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 0D8GNdO5YmPgYAAAauVa8A (envelope-from ) for ; Wed, 02 Nov 2022 19:41:23 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9CE7AB3B2 for ; Wed, 2 Nov 2022 19:41:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqIfi-0004tB-LZ; Wed, 02 Nov 2022 14:41:06 -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 1oqIff-0004q1-Oq for guix-patches@gnu.org; Wed, 02 Nov 2022 14:41:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oqIff-00045b-FW for guix-patches@gnu.org; Wed, 02 Nov 2022 14:41:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oqIR9-00067v-Dd for guix-patches@gnu.org; Wed, 02 Nov 2022 14:26:03 -0400 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1667414483; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ir4r/MCmgUpUSFEi/PdIOAsawQMjJUl7sHJjCCyq7Ws=; b=HkrkH7He8JtkQyLjzvuWZM18G0fDuBnKfqNSRw49Wiu68Ng3g028T5qSHRBfAO/sugvZne 0eD8Bf/mcSmDFvRbcnB1PzbxiiMJUKqRgtc6jAMZ20JGkO45t3lK2uMd910a7zf858pv0B oAmDjAty+eZ1iMfETlAM/7MRyZpxwIrUjoLJ+q8IDUaFKw1bhruRjQQLOo/k95Cqugu6oH NN93q5gQzDz3Zz9kTHlP7sHNwIlC/AfdbAAo5Qh+6xTnQPiGpPtER2+1alvczSYo38I0Pi aU7t+TmxcT1f7lnooT2z74iQkfNweWd7Q+1HAdPwJIneBop7cdi6YOUODDl6Hw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1667414483; a=rsa-sha256; cv=none; b=rv1SkI094xaSli1WT9gXGXghPADasTdho1PK2Fb2Nob0hl2KxJIW1SgOAUW3BDWEOx5vR8 yXhaAjqiRtKsOwz6JED10VphxGVNGgjmE8/s4Y8rlmzTPm2aYt+gzmY/l2r/TxMsOe0eiq Z1fl0qKkuXcfG/DOCwZgJ9hkvB+hPm8M26oWBS1JBuvAhntXTIeHrsg6Pyju0GvYy4jvR7 z4bX+e38tJO17tqBnJ2tMBiEfx7xuPe3b/wGCJd8JdjgxjSucTg7kERAagO4YVQHCnOGQT 9BgDxyNcMGOazTP3UdlgLmJPju+Xjtd3PxjdKz27cZdHm2zZn/nSEgf24HxCrw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=kBsAj5OS; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 7.51 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=kBsAj5OS; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 9CE7AB3B2 X-Spam-Score: 7.51 X-Migadu-Scanner: scn1.migadu.com X-TUID: Rm2YNDmPzAT0 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