From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wHdxJKs/M2HmAQAAgWs5BA (envelope-from ) for ; Sat, 04 Sep 2021 11:43:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 8OlLIKs/M2FBEwAA1q6Kng (envelope-from ) for ; Sat, 04 Sep 2021 09:43:07 +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 4E6D010295 for ; Sat, 4 Sep 2021 11:43:07 +0200 (CEST) Received: from localhost ([::1]:40234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMSCY-0003Kz-Dy for larch@yhetil.org; Sat, 04 Sep 2021 05:43:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMSCU-0003Kq-Ml for guix-patches@gnu.org; Sat, 04 Sep 2021 05:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35106) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mMSCU-00007T-Ed for guix-patches@gnu.org; Sat, 04 Sep 2021 05:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mMSCU-0002oa-Ch for guix-patches@gnu.org; Sat, 04 Sep 2021 05:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50077] [PATCH v2 3/3] gnu: Add emacs-notmuch. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Sep 2021 09:43:02 +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: 50077@debbugs.gnu.org Cc: Andrew Tropin Received: via spool by 50077-submit@debbugs.gnu.org id=B50077.163074856410784 (code B ref 50077); Sat, 04 Sep 2021 09:43:02 +0000 Received: (at 50077) by debbugs.gnu.org; 4 Sep 2021 09:42:44 +0000 Received: from localhost ([127.0.0.1]:46652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMSCB-0002ns-Ka for submit@debbugs.gnu.org; Sat, 04 Sep 2021 05:42:44 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:60162 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMSC8-0002nb-7O for 50077@debbugs.gnu.org; Sat, 04 Sep 2021 05:42:42 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1630748554; bh=WPDRUSYNZIiXuXo41CgmHUrytseWafwFlkYsdu1IJDk=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=BlyblS3Owd6pLS1AHHAii7BT/19ubTcUwEkdYl5SFudp4oei8C7xbkRZBCqQBwm+i YX5K/K0kmhZEU/mNDGkQN0TyIyjbvF3B+0tMIYQBH59XKlMvvN4f7WbWEOintadg+g SyTADndZG4vBXE9Nzq4BjL5kll2npZ08yLai92bY= In-Reply-To: References: Message-Id: Date: Sat, 04 Sep 2021 11:42:33 +0200 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: , 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=1630748587; 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=vy5xH28pC2lVMSgBeM8XyrVjxIeTbnnrYvcginAReiA=; b=EY/iKyFckU/NjVlwuwa1Kv0lFrutXOKhPCcoW2QxzCJHCbzLkXGUaXoz4uNfvb8qPwy8t/ I0Wo7r2nKrHezHBlHPrU8Wv7i7BBcTllLztp8gdL+laSjQz5DN4TliO/yd9/BAW80YxQKL 7G//RW4PZabb0a8Yw2YGou4F8Sg6sLx0PbE8JxZwEfS0A2p9+5mqh73f4bVmoqlnNisYMZ cmBqFbZlQihL4XVeT/+YLQtx0dwFzbrH/e8XLyMu8C81jYORsm1sWNl07GAFgBVP76nTna wfqrgIbvEACs4xtOFTaCQeZiatUlZeivwnb9Y53q8iBjMc7nchBEhraBgRTW9Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630748587; a=rsa-sha256; cv=none; b=NzU3S8Wkk0nHlFfW/NiORPtxeYFBXX9LkT3gJtgoZJxGZoBjf8Jsy1+B9NEUTNeauBHQZH pC5uDTIjTMVUegt/qbYYYwNwTVv8asIzbqJ0thZxYoL6my0Vj/FUHMaLLJ+/RWoqSrdF3S bHt88T9I8AP70e+ablzdw0/GC+iNXzhJhNFHKEKgc9/wYKyOmyo25NpyNLDO68bRUpHQDL zO736FY1gHZCGYDvMXJB6tDIaflildf/qnNo28Ylhw6pATYXVSKXIrS6EDLJwipkLubRSb FmDqUyi2+q/aVBV1OXJoHBuLmik+U0nZqKaEBj8mWdotBKxuo2L3JvUN/z4XvQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=BlyblS3O; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=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: 1.18 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=BlyblS3O; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=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: 4E6D010295 X-Spam-Score: 1.18 X-Migadu-Scanner: scn1.migadu.com X-TUID: ziewo3jDID6b * 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 result @@ -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 hoo= k.") "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 hook= .") (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 t= ests ("pkg-config" ,pkg-config) ("python" ,python) ("python-docutils" ,python-docutils) @@ -1391,6 +1376,7 @@ invoking @command{notifymuch} from the post-new hook.= ") ("texinfo" ,texinfo) =20 ;; The following are required for tests only. + ("emacs" ,emacs-no-x) ; -minimal lacks libxml, needed for some t= ests ("which" ,which) ("dtach" ,dtach) ("gnupg" ,gnupg) @@ -1409,6 +1395,32 @@ invoking @command{notifymuch} from the post-new hook= .") ing, and tagging large collections of email messages.") (license license:gpl3+))) =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\""))))))))) + (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") --=20 2.33.0