From patchwork Sat Sep 4 09:41:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 32612 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C0F9927BBE3; Sat, 4 Sep 2021 10:42:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8F90427BBE1 for ; Sat, 4 Sep 2021 10:42:19 +0100 (BST) Received: from localhost ([::1]:39572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMSBm-0002rl-Lb for patchwork@mira.cbaines.net; Sat, 04 Sep 2021 05:42:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMSBW-0002q3-Tz for guix-patches@gnu.org; Sat, 04 Sep 2021 05:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35101) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mMSBW-0007d8-M3 for guix-patches@gnu.org; Sat, 04 Sep 2021 05:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mMSBW-0002mR-IC for guix-patches@gnu.org; Sat, 04 Sep 2021 05:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50077] [PATCH v2 1/3] gnu: notmuch: Build Texinfo manual. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Sep 2021 09:42: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 Received: via spool by 50077-submit@debbugs.gnu.org id=B50077.163074850410635 (code B ref 50077); Sat, 04 Sep 2021 09:42:02 +0000 Received: (at 50077) by debbugs.gnu.org; 4 Sep 2021 09:41:44 +0000 Received: from localhost ([127.0.0.1]:46643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMSBE-0002lT-6H for submit@debbugs.gnu.org; Sat, 04 Sep 2021 05:41:44 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:60126 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMSBC-0002lD-0p for 50077@debbugs.gnu.org; Sat, 04 Sep 2021 05:41:42 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1630748496; bh=4ubAYvGRPuvW701rKIvOs1ToihUgwRI/ZOmx7k/5788=; h=From:To:Subject:In-Reply-To:References:Date; b=iy5nTl0+040zPqvI/mTEvGkSSEYw/jpGcWml3T4rO7du2o9pObm047xP7E2eWlFxu 4etVpVMTtbyKTcewfy4EReM1ENlnRTgiqUpgx2zlanA74W+iDDy6KdlJ5jCe9s1i4I jlqZFc3elXn/nQ2uRyWejENldSNG8/dqRJQNZU5I= In-Reply-To: References: Message-Id: Date: Sat, 04 Sep 2021 11:41:36 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mail.scm (notmuch)[native-inputs]: Add 'texinfo'. --- gnu/packages/mail.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 87094cb9eb..eb141c5984 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1388,6 +1388,7 @@ invoking @command{notifymuch} from the post-new hook.") ("python" ,python) ("python-docutils" ,python-docutils) ("sphinx" ,python-sphinx) + ("texinfo" ,texinfo) ;; The following are required for tests only. ("which" ,which) From patchwork Sat Sep 4 09:41:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 32611 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3270627BBE3; Sat, 4 Sep 2021 10:42:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 025CB27BBE1 for ; Sat, 4 Sep 2021 10:42:19 +0100 (BST) Received: from localhost ([::1]:39550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMSBm-0002qM-2C for patchwork@mira.cbaines.net; Sat, 04 Sep 2021 05:42:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMSBX-0002qC-7Z for guix-patches@gnu.org; Sat, 04 Sep 2021 05:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35102) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mMSBW-0007dZ-W7 for guix-patches@gnu.org; Sat, 04 Sep 2021 05:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mMSBW-0002mY-UJ for guix-patches@gnu.org; Sat, 04 Sep 2021 05:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50077] [PATCH v2 2/3] gnu: notmuch: Make cross-compilable. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Sep 2021 09:42: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 Received: via spool by 50077-submit@debbugs.gnu.org id=B50077.163074852110677 (code B ref 50077); Sat, 04 Sep 2021 09:42:02 +0000 Received: (at 50077) by debbugs.gnu.org; 4 Sep 2021 09:42:01 +0000 Received: from localhost ([127.0.0.1]:46646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMSBV-0002m5-CX for submit@debbugs.gnu.org; Sat, 04 Sep 2021 05:42:01 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:60138 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMSBT-0002lr-OE for 50077@debbugs.gnu.org; Sat, 04 Sep 2021 05:42:00 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1630748514; bh=LD04NsVhj+b5zIF7TkKC/+G7vRcknqVQj0VjtwXI9Ww=; h=From:To:Subject:In-Reply-To:References:Date; b=I1FWcBCCTY9yikgDz7Q3MTp85Hyx5Ccwspw5QoU0DMNe70F0qXr18+VsZG0WSFO15 eU5cu3lL4fGFPXwoi6VI37k35EEe6vpILdE55yEnh9D05LWsvOpf/u2Qo92CGfLe+L fb0rB9+ddj+CTYgiTRdCymhP9Txh3bfrjX3y+ihQ= In-Reply-To: References: Message-Id: Date: Sat, 04 Sep 2021 11:41:53 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mail.scm (notmuch)[arguments]<#:phases>: Use 'cc-for-target' instead of 'gcc'. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index eb141c5984..173982cb12 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1358,7 +1358,7 @@ invoking @command{notifymuch} from the post-new hook.") (("/bin/sh") (which "sh"))))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - (setenv "CC" "gcc") + (setenv "CC" ,(cc-for-target)) (setenv "CONFIG_SHELL" (which "sh")) (let* ((out (assoc-ref outputs "out")) @@ -1375,7 +1375,7 @@ invoking @command{notifymuch} from the post-new hook.") (("\\$NOTMUCH_GMIME_X509_CERT_VALIDITY") "0")))) (add-before 'check 'prepare-test-environment (lambda _ - (setenv "TEST_CC" "gcc") + (setenv "TEST_CC" ,(cc-for-target)) ;; Patch various inline shell invocations. (substitute* (find-files "test" "\\.sh$") (("/bin/sh") (which "sh"))))) From patchwork Sat Sep 4 09:42:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 32613 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9115927BBE4; Sat, 4 Sep 2021 10:43:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0643127BBE3 for ; Sat, 4 Sep 2021 10:43:14 +0100 (BST) Received: from localhost ([::1]:40234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMSCf-0003Kz-5h for patchwork@mira.cbaines.net; Sat, 04 Sep 2021 05:43:13 -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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mail.scm (notmuch)[arguments]: Remove Emacs-related stuff. * gnu/packages/emacs-xyz.scm (emacs-consult-notmuch)[propagated-inputs]: Add ‘emacs-notmuch’. (emacs-counsel-notmuch)[propagated-inputs]: Use ‘emacs-notmuch’ instead of ‘notmuch’. (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 hook.") "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=1" ; verbose test output "NOTMUCH_TEST_TIMEOUT=1h") ; 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=" out) - (string-append "--emacslispdir=" elisp) - (string-append "--emacsetcdir=" 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 tests ("pkg-config" ,pkg-config) ("python" ,python) ("python-docutils" ,python-docutils) @@ -1391,6 +1376,7 @@ invoking @command{notifymuch} from the post-new hook.") ("texinfo" ,texinfo) ;; 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 hook.") ing, and tagging large collections of email messages.") (license license:gpl3+))) +(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")