From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aFYUChxOQGHTiAAAgWs5BA (envelope-from ) for ; Tue, 14 Sep 2021 09:24:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id OJSmBRxOQGEjVAAAbx9fmQ (envelope-from ) for ; Tue, 14 Sep 2021 07:24:12 +0000 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 5F4D7E797 for ; Tue, 14 Sep 2021 09:24:11 +0200 (CEST) Received: from localhost ([::1]:42052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ2na-0001ZU-E3 for larch@yhetil.org; Tue, 14 Sep 2021 03:24:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ2nS-0001ZJ-9f for guix-patches@gnu.org; Tue, 14 Sep 2021 03:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQ2nR-0008At-SX for guix-patches@gnu.org; Tue, 14 Sep 2021 03:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mQ2nR-0001mG-N0 for guix-patches@gnu.org; Tue, 14 Sep 2021 03:24:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50077] [PATCH v2 3/3] gnu: Add emacs-notmuch. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Sep 2021 07:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50077 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Xinglu Chen , 50077@debbugs.gnu.org Received: via spool by 50077-submit@debbugs.gnu.org id=B50077.16316041866767 (code B ref 50077); Tue, 14 Sep 2021 07:24:01 +0000 Received: (at 50077) by debbugs.gnu.org; 14 Sep 2021 07:23:06 +0000 Received: from localhost ([127.0.0.1]:47393 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQ2mX-0001l4-IK for submit@debbugs.gnu.org; Tue, 14 Sep 2021 03:23:05 -0400 Received: from mail-lj1-f173.google.com ([209.85.208.173]:38739) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQ2mU-0001kN-Lr for 50077@debbugs.gnu.org; Tue, 14 Sep 2021 03:23:03 -0400 Received: by mail-lj1-f173.google.com with SMTP id g14so22000878ljk.5 for <50077@debbugs.gnu.org>; Tue, 14 Sep 2021 00:23:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop-in.20150623.gappssmtp.com; s=20150623; h=from:to:subject:in-reply-to:references:date:message-id:mime-version; bh=g7t4/0WZb3PMCV87s5kaRHwRAhJWF08soAfddTZpMgg=; b=OwkykzIedHdFjec5sQZqIzp1c7d3HvDiEDyJWZI3jVi+JDD+SaRhvUhXdSHQtZMhDG fgshV1TLvwzwVAGuieDmOq0FlTUFMm2XybV6Ge1uJDwxA/h6i53UA7q9ObgLVBVkudOL IMexK8yh1hpTTGwuPYQKjVlhNOuRXOYs23UkKdEuiJepJAGGP/N/G5aESmUGaKotOJg1 TI5QL8lPLfkO4jZAliZ7Q8e2Iiyiz8NMfn4jh5umKtuazLDZF0vi00d8c45Hg/ekzmxX ZlweniHFJhRvn1CBRGDRiC0EP6UIgtwc6iDPrGJsxNG/+eOyun9Ip5OdrDPTton0VJIu BnOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:in-reply-to:references:date :message-id:mime-version; bh=g7t4/0WZb3PMCV87s5kaRHwRAhJWF08soAfddTZpMgg=; b=MbDTYjLpBNAIj+NpV6TeQ+UjlXW2weiTeh914kMBN0Yj1jrtlWvK2avn+CZaBY6loZ oHGUJMtTGa2NPbpGEjC3NpMvWrpRzBTqpXo/QH3zJFcyioABy/McOaEL72SSgaeAidAr QFUSgAIJ2foPlu5HXizrBZ9rmxg7Yd4Ht7TsXFbG2lQGC9VxrlT5lgHA1Ibj5QCsojWu TSINAciJ64Wd3LK1crVjhVlk6vEqZZxZ+Rn94JDNf/nnd9ReStZuwYr32NIWG6yavlHc 1xwf80xKjUlUdSeW2kl443uAjjwyFnjnC+lIZtd6v5TdiV8+xq/SX+UvuK2MKI+tUfrc CH3Q== X-Gm-Message-State: AOAM530fuCX+B3TMkPdGrLicyKA+T1SGdX7D3/uFEv8MmCjdUhccCnm6 UrBcqX4hjUtUT32IhlXwySuztg== X-Google-Smtp-Source: ABdhPJweglwR5mtwhvQJupMTkRZRk8axV+Cm1ZZSiN2t8ASHyYysCAaL9govpvgM8Vm5zdsgaukh0A== X-Received: by 2002:a2e:8598:: with SMTP id b24mr13538400lji.209.1631604176340; Tue, 14 Sep 2021 00:22:56 -0700 (PDT) Received: from localhost (109-252-93-92.nat.spd-mgts.ru. [109.252.93.92]) by smtp.gmail.com with ESMTPSA id m15sm1037569lfg.59.2021.09.14.00.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Sep 2021 00:22:55 -0700 (PDT) From: Andrew Tropin In-Reply-To: References: Date: Tue, 14 Sep 2021 10:22:52 +0300 Message-ID: <878rzzmxir.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1631604251; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: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=g7t4/0WZb3PMCV87s5kaRHwRAhJWF08soAfddTZpMgg=; b=FL5EV1igryRPql+o8z3vOU8Judm5EAiulDvsaR/WTrDFXikdGd4uAMQUq06KrSS312tTpG xFNlIIipfwn7YEVbKPPG2TzkkDL8SBJMYE0Eb2kujO1LDsLQMMq5g+XgnrLMfhnRzN842r iQPGpgPDUPBIj/KYaSmIBi/kOx9opTV2g+p1fd9Bx9wFd/hV+p7kercTZ+qqRJAIxTugzK kL7tc9u3GYH3xxBsnucExyy5e2Q/b3V+luI4iGiUeKdbSMWI01332Ybeop8wx4IKC6yJB1 lmu4QlFdQJISeolg/2hxD/PFF0q4gckpWQr2M2AQ723YLAfdPGndZh1fPgtPaA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631604251; a=rsa-sha256; cv=none; b=BsdeSYK0KMiqrF9bcJ7Xb+eH88euwduiSWD/jmFIHE6kGQsj0UjkzyB1oDJ5paNkClohQH eP1X0FsmDwWgYkbtXLhSpHbkniCCxhpjO/5IPY5htCxfVnfu9yhK3UsnlVIfG75qzuVg/p sCVemkMK1McGp1AlKxx040t3hkevY+rTqNUKMEhooBOGNWkHW/I5lQv/pHvSmIDOFXkGAe XLPthI6figfUhrkzS2pqZB0fIp7a3VjlVZtk/v1r08ZLBBCdM9tHkByli746aaAHLaxZaT PoHlqm85aCy1W2nL7UtUf04dDVNPDBMRimRLHNssVlhw/k+p3Kx39qMSx6sIzw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20150623.gappssmtp.com header.s=20150623 header.b=OwkykzIe; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.00 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20150623.gappssmtp.com header.s=20150623 header.b=OwkykzIe; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 5F4D7E797 X-Spam-Score: -2.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: Wl/0qONcmwng --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2021-09-04 11:42, Xinglu Chen wrote: > * gnu/packages/mail.scm (notmuch)[arguments]: Remove Emacs-related stuff. > * gnu/packages/emacs-xyz.scm (emacs-consult-notmuch)[propagated-inputs]: = Add > =E2=80=98emacs-notmuch=E2=80=99. > (emacs-counsel-notmuch)[propagated-inputs]: Use =E2=80=98emacs-notmuch=E2= =80=99 instead of > =E2=80=98notmuch=E2=80=99. > (emacs-helm-notmuch): Likewise. > (emacs-notmuch-maildir): Likewise. > --- > gnu/packages/emacs-xyz.scm | 8 +++--- > gnu/packages/mail.scm | 52 +++++++++++++++++++++++--------------- > 2 files changed, 37 insertions(+), 23 deletions(-) > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index 030809f5ac..67ba8bf523 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -8304,7 +8304,7 @@ list of candidates.") > (build-system emacs-build-system) > (propagated-inputs > `(("emacs-consult" ,emacs-consult) > - ("notmuch" ,notmuch))) > + ("emacs-notmuch" ,emacs-notmuch))) > (home-page "https://codeberg.org/jao/consult-notmuch") > (synopsis "Search and preview Notmuch emails using Consult") > (description > @@ -9490,6 +9490,8 @@ queries using counsel.") > `(("emacs-counsel" ,emacs-counsel) > ("notmuch" ,notmuch) > ("emacs-s" ,emacs-s))) > + (propagated-inputs > + `(("emacs-notmuch" ,emacs-notmuch))) > (home-page "https://github.com/fuxialexander/counsel-notmuch") > (synopsis "Search emails in Notmuch asynchronously with Ivy") > (description > @@ -23952,7 +23954,7 @@ workspaces with a LSP-compliant server running.") > (build-system emacs-build-system) > (propagated-inputs > `(("emacs-helm" ,emacs-helm) > - ("notmuch" ,notmuch))) > + ("emacs-notmuch" ,emacs-notmuch))) > (synopsis "Search emails with Emacs Notmuch and Helm") > (description > "This package can be used to search emails in Emacs, searching resu= lt > @@ -23975,7 +23977,7 @@ real search.") > "0pmikf1djkr07067nkgmdcxyn7l7ibswx6qlnai8v1v51f9h1g9q"))= )) > (build-system emacs-build-system) > (propagated-inputs > - `(("notmuch" ,notmuch))) > + `(("emacs-notmuch" ,emacs-notmuch))) > (home-page "https://git.sr.ht/~tarsius/notmuch-maildir") > (synopsis "Visualize maildirs as a tree") > (description > diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm > index 173982cb12..729e47cb95 100644 > --- a/gnu/packages/mail.scm > +++ b/gnu/packages/mail.scm > @@ -167,6 +167,7 @@ > #:use-module (guix build-system gnu) > #:use-module (guix build-system go) > #:use-module (guix build-system guile) > + #:use-module (guix build-system emacs) > #:use-module (guix build-system meson) > #:use-module (guix build-system perl) > #:use-module (guix build-system python) > @@ -1342,31 +1343,18 @@ invoking @command{notifymuch} from the post-new h= ook.") > "1myylb19hj5nb1vriqng252vfjwwkgbi3gxj93pi2q1fzyw7w2lf"))= )) > (build-system gnu-build-system) > (arguments > - `(#:modules ((guix build gnu-build-system) > - ((guix build emacs-build-system) #:prefix emacs:) > - (guix build utils)) > - #:imported-modules (,@%gnu-build-system-modules > - (guix build emacs-build-system) > - (guix build emacs-utils)) > - #:make-flags > + `(#:make-flags > (list "V=3D1" ; verbose test output > "NOTMUCH_TEST_TIMEOUT=3D1h") ; don't fail on slow machines > #:phases (modify-phases %standard-phases > - (add-after 'unpack 'patch-notmuch-lib.el > - (lambda _ > - (substitute* "emacs/notmuch-lib.el" > - (("/bin/sh") (which "sh"))))) > (replace 'configure > (lambda* (#:key outputs #:allow-other-keys) > (setenv "CC" ,(cc-for-target)) > (setenv "CONFIG_SHELL" (which "sh")) > - > - (let* ((out (assoc-ref outputs "out")) > - (elisp (emacs:elpa-directory out))) > + (let* ((out (assoc-ref outputs "out"))) > (invoke "./configure" > (string-append "--prefix=3D" out) > - (string-append "--emacslispdir=3D" elisp) > - (string-append "--emacsetcdir=3D" elisp)= )))) > + "--without-emacs")))) > (add-before 'check 'disable-failing-tests > ;; FIXME: Investigate why these tests are failing, > ;; and try removing this for notmuch versions > 0.31. > @@ -1378,12 +1366,9 @@ invoking @command{notifymuch} from the post-new ho= ok.") > (setenv "TEST_CC" ,(cc-for-target)) > ;; Patch various inline shell invocations. > (substitute* (find-files "test" "\\.sh$") > - (("/bin/sh") (which "sh"))))) > - (add-after 'install 'make-autoloads > - (assoc-ref emacs:%standard-phases 'make-autoloads)))= )) > + (("/bin/sh") (which "sh")))))))) > (native-inputs > `(("bash-completion" ,bash-completion) > - ("emacs" ,emacs-no-x) ; -minimal lacks libxml, needed for some= tests > ("pkg-config" ,pkg-config) > ("python" ,python) > ("python-docutils" ,python-docutils) > @@ -1391,6 +1376,7 @@ invoking @command{notifymuch} from the post-new hoo= k.") > ("texinfo" ,texinfo) >=20=20 > ;; The following are required for tests only. > + ("emacs" ,emacs-no-x) ; -minimal lacks libxml, needed for some= tests > ("which" ,which) > ("dtach" ,dtach) > ("gnupg" ,gnupg) > @@ -1409,6 +1395,32 @@ invoking @command{notifymuch} from the post-new ho= ok.") > ing, and tagging large collections of email messages.") > (license license:gpl3+))) >=20=20 > +(define-public emacs-notmuch > + (package > + (inherit notmuch) > + (name "emacs-notmuch") > + (build-system emacs-build-system) > + (native-inputs '()) > + (inputs > + `(("notmuch" ,notmuch))) > + (arguments > + `(#:exclude (cons* "make-deps.el" "rstdoc.el" %default-exclude) > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'chdir > + (lambda _ > + (chdir "emacs"))) > + (add-after 'chdir 'patch-paths > + (lambda* (#:key inputs #:allow-other-keys) > + (let ((notmuch (assoc-ref inputs "notmuch"))) > + (substitute* "notmuch-lib.el" > + (("\"notmuch\"") > + (string-append "\"" notmuch "/bin/notmuch\""))))))))) Not sure if we need to hardcode the path to notmuch binary (some people can use guix for managing emacs packages, but not system), but I think it's a rare case and this default is reasonable and easily fixable by simple `(setq notmuch-command "notmuch")` in the cases, when notmuch itslef provided by other package manager. > + (synopsis "Run Notmuch within Emacs") > + (description > + "This package provides an Emacs-based interface to the Notmuch mail > +system."))) > + > (define-public notmuch-addrlookup-c > (package > (name "notmuch-addrlookup-c") Overall, LGTM. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmFATcwACgkQIgjSCVjB 3rAMtxAAjDBugwYXQcSSKHyDjBX6KA3JNErwJmL6HAS5MJZlsB8WaVZNdjizwk4G keJrzTOam6SgfpUXCcsSJ2GjZG6aMN/2MXi7QrUdbx9FYQt2xr118hBdSu9nBaSl M01wuMM3PRFQg5l8Gbto6Lo3E/jVEIL3Xm4dU75ULY2s1DNos/ZMr3kNY+Kb3ILa QVqsYqhodbG/2kHKiFRdxWxnZHJ1x5wXcaqyjeHf5tl/xrqK6Qu3oSHhj+OWuWIJ /Ce9zBVsf5c7rTwcMuySH52guu2DxXrcMqWWNADnfqptE4PVcpaiQjBqUKiEXEC9 nFJA9hEMeHES5ZU5JAmEk04cVFEI1RwHUHkP7B/JZD8wiJd7FAkyJyHeXnYSf3NL Uj8/TGVCS7qKJvMf7ddj4IDLd23zc4EjyOAiU39sZiAI3/GUc7DFEto7+KhBzkwJ YTWaXmrk2+QeN4cNXYGzicB3DnKzXLaS+AbeEldxnn/vEEutqe8//zxg8wiEjwqG R9DXsnnsP+V0LUVWwkxXtAFeS2UdqXzBgHJJcq4CAxXa/fBnOtuvVT5Ew36gqRHI Q04OnxgMqZE80SnkSK/ZLMa9mJAlmN3ckKBFniwEnk//0kbDAsQgaKW4WNNmCk9p xOe7eFCbHnJcq7yIemUbhfj05DsTrwXf2oUvQ630kDk9bHOYwIM= =i949 -----END PGP SIGNATURE----- --=-=-=--