From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id sEDAOoxyGmGwJAEAgWs5BA (envelope-from ) for ; Mon, 16 Aug 2021 16:13:32 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id oJVwNoxyGmGvFwAAB5/wlQ (envelope-from ) for ; Mon, 16 Aug 2021 14:13:32 +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 A22BD54E3 for ; Mon, 16 Aug 2021 16:13:32 +0200 (CEST) Received: from localhost ([::1]:44974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFdMj-0005X5-Iq for larch@yhetil.org; Mon, 16 Aug 2021 10:13:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFdMN-0005Wg-44 for guix-patches@gnu.org; Mon, 16 Aug 2021 10:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39132) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFdMM-0002of-J0 for guix-patches@gnu.org; Mon, 16 Aug 2021 10:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFdMM-0004u3-ED for guix-patches@gnu.org; Mon, 16 Aug 2021 10:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50077] [PATCH 1/3] gnu: notmuch: Add separate 'emacs' output. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Aug 2021 14:13: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: Nicolas Goaziou , Andrew Tropin Received: via spool by 50077-submit@debbugs.gnu.org id=B50077.162912315418785 (code B ref 50077); Mon, 16 Aug 2021 14:13:02 +0000 Received: (at 50077) by debbugs.gnu.org; 16 Aug 2021 14:12:34 +0000 Received: from localhost ([127.0.0.1]:50672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFdLt-0004su-OJ for submit@debbugs.gnu.org; Mon, 16 Aug 2021 10:12:33 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:50454 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFdLr-0004sh-P9 for 50077@debbugs.gnu.org; Mon, 16 Aug 2021 10:12:32 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1629123144; bh=Mck8+RN4a+JI2cFzpcFLhiuQEqPibAeFOwLolNsngjg=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=JHSwRy5OU6ClkQb5GAJ8Ji8d9ib5fxaJhREvUKYnJiU2eEXx5Hip8nXb7dMH6CKqw j6ZEe4aiNTkUsUPMsRf7Fp6uog5soNnflEBzsWR3HDG6G85y3YYETt8nNmcY+7Q2f4 nu+vZRUngy8Ggd6NTRhKXD0l5WPRiHtbVjz5xPYY= In-Reply-To: References: Message-Id: Date: Mon, 16 Aug 2021 16:12:19 +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=1629123212; 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=uKbpKMq7h4R+lnrS0oRfWXeDtU0tSHLR0EHFjqCUOtw=; b=GPfPcr4otJgaq8I/EZ73PxfY7gu9HWjzd6oL/1EQXxpNZWISm5w/B84jgiW6/RqZRDEDvQ 4f3HAlZwYv2knGJceR47x/9BhTVeIiuzByPmI/KjByXy4LMfzyQA7HWN+it5tkRRtX3keP AoAIky/f9yxpgTg/A4G7mI9IniVcKdt7JzNVjExg7wx9ZS21yH/6RcT/iz9H8sOtvc6h05 EMYFSAyxMSJPzNU2L01eJpQb1dn1arIssRq9qUT/y17+3CboeecC7SRR+76u+zziOhegM/ op5XzVF9g5MyR/2aPqZm5nU0WEl5IKjONwy1L7czy3FNrp4EYOgcLeWxek9wqQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629123212; a=rsa-sha256; cv=none; b=tzeFeyprQADBr0iR0/Z1ecybNeZ8j6ZXHHIkAmN0m6FFXWiUA1PpPRcb8hlfC8PSJZb8E5 rLJll3jBKGXNB5teani89/PDI6UXptHwLsfDcWLstyB5VNli7QDU9tVfhq9qJhmqI3mToT sVC59WeuuVQw76w6mJFNquFlQxdMcCScHZDNTsjzi1q69zw40hK6aFxsnGrD84HPdQYQwL CJ573nDsJzlC7WqdXW9CRoVkN5PYArKjAzAXLEHXQuo6g/+mehfhJOQezdvaw4hfoL/x6P qq66ubzMZUHksDe0vEYMkzqYVGgJ1HVNtEhATd7yCiiwCA0GANkjiT1LZhHkmg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=JHSwRy5O; 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: -0.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=JHSwRy5O; 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: A22BD54E3 X-Spam-Score: -0.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: Mui3zn33lQX+ * gnu/packages/mail.scm (notmuch)[outputs]: Add =E2=80=98emacs=E2=80=99 out= put [arguments]<#:modules>: Add (guix build emacs-utils). <#:phases>{configure}: Use the =E2=80=98emacs=E2=80=99 output. {make-autoloads}: Modify the default =E2=80=98make-autoloads=E2=80=99 phase= to use the =E2=80=98emacs=E2=80=99 output. --- gnu/packages/mail.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ccf44b7cf3..bbc616f6f5 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1337,7 +1337,8 @@ invoking @command{notifymuch} from the post-new hook.= ") (arguments `(#:modules ((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) - (guix build utils)) + (guix build utils) + (guix build emacs-utils)) #:imported-modules (,@%gnu-build-system-modules (guix build emacs-build-system) (guix build emacs-utils)) @@ -1355,7 +1356,8 @@ invoking @command{notifymuch} from the post-new hook.= ") (setenv "CONFIG_SHELL" (which "sh")) =20 (let* ((out (assoc-ref outputs "out")) - (elisp (emacs:elpa-directory out))) + (emacs (assoc-ref outputs "emacs")) + (elisp (emacs:elpa-directory emacs))) (invoke "./configure" (string-append "--prefix=3D" out) (string-append "--emacslispdir=3D" elisp) @@ -1373,7 +1375,14 @@ invoking @command{notifymuch} from the post-new hook= .") (substitute* (find-files "test" "\\.sh$") (("/bin/sh") (which "sh"))))) (add-after 'install 'make-autoloads - (assoc-ref emacs:%standard-phases 'make-autoloads))))) + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((emacs (string-append (assoc-ref inputs "emac= s") "/bin/emacs")) + (out (assoc-ref outputs "emacs")) + (elpa-name-ver ((@@ (guix build emacs-build-s= ystem) + store-directory->elpa-nam= e-version) out)) + (elpa-name (package-name->name+version elpa-n= ame-ver)) + (el-dir (emacs:elpa-directory out))) + (emacs-generate-autoloads elpa-name el-dir))))))) (native-inputs `(("bash-completion" ,bash-completion) ("emacs" ,emacs-no-x) ; -minimal lacks libxml, needed for some t= ests @@ -1394,6 +1403,7 @@ invoking @command{notifymuch} from the post-new hook.= ") ("talloc" ,talloc) ("xapian" ,xapian) ("zlib" ,zlib))) + (outputs '("out" "emacs")) (home-page "https://notmuchmail.org/") (synopsis "Thread-based email index, search, and tagging") (description --=20 2.32.0