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 AOdRNfOT/mI4cAEAbAwnHQ (envelope-from ) for ; Thu, 18 Aug 2022 21:33:07 +0200 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 qJBGNfOT/mLAnAAAauVa8A (envelope-from ) for ; Thu, 18 Aug 2022 21:33:07 +0200 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 A018DF821 for ; Thu, 18 Aug 2022 21:33:07 +0200 (CEST) Received: from localhost ([::1]:50834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oOlGM-0002wY-QX for larch@yhetil.org; Thu, 18 Aug 2022 15:33:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOlGI-0002wP-Og for guix-patches@gnu.org; Thu, 18 Aug 2022 15:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38783) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oOlGI-0008Pm-G3 for guix-patches@gnu.org; Thu, 18 Aug 2022 15:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oOlGI-0005wK-3K for guix-patches@gnu.org; Thu, 18 Aug 2022 15:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57280] [PATCH 0/3] Add documentation-files argument to emacs build system. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Aug 2022 19:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57280 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Andrew Tropin , 57280@debbugs.gnu.org Received: via spool by 57280-submit@debbugs.gnu.org id=B57280.166085112222766 (code B ref 57280); Thu, 18 Aug 2022 19:33:02 +0000 Received: (at 57280) by debbugs.gnu.org; 18 Aug 2022 19:32:02 +0000 Received: from localhost ([127.0.0.1]:56765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOlFJ-0005uy-Vq for submit@debbugs.gnu.org; Thu, 18 Aug 2022 15:32:02 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:34626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOlFD-0005uZ-ON for 57280@debbugs.gnu.org; Thu, 18 Aug 2022 15:32:00 -0400 Received: by mail-ej1-f67.google.com with SMTP id tl27so5092233ejc.1 for <57280@debbugs.gnu.org>; Thu, 18 Aug 2022 12:31:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:from:to:cc; bh=PEA+6Xh3aifJk7CkO3RMg+BlJStisBQVimf2zAgBmvs=; b=CqaQgmuOPSh6DQYIMug4w/BU9FeBVOnyjxhM6oVmlTC4XP6oR+eMaDy44OAxPRQaYX 8zkMAh9Q8rSa0jFQ3YgQKkmsgApNeq3pRU+CgzDA0L/B9Q4GBJSOWYIF8oSyDh6P63cH 2B6yk24ovhmNO/pDnLt3M/z7qK82b1uDuigGsS4dIKiwMqJM326Ib2BFpb2ZNVQVK1pQ PJSTZaKrEtw4qd87N7p/kYL7VOS+5TiqUVph4M5PvGeOaTscuBwSCyD17Qzq1gRWTS7R mRGAmJgh+TD8tZvfkhzuCdwmjZzSLecSj5oEmIyx0NLAtCq6OJYguunbagwEgBK1yTo0 mC0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc; bh=PEA+6Xh3aifJk7CkO3RMg+BlJStisBQVimf2zAgBmvs=; b=mJxi7z+y7Ne1BqqLePjNjwIrpUGeVbN9Q5KQHgDZqSQy3aibrELAdHVI+FfyVOFdPS iyZumfMLa+mXj7kQUgzvBPrn09eUhCmqDQeuvECDQoRysCrFc8MVwoIbbizT5RhH5EID nlgARYvF0/HCu/9UzuadqD9o1pVE87guXwOMyitD0h3JVN1M8KMn7jXtTsOS1wMikrru bBp0huoI6AaTjP28O3y18EpcPHnfZSTlU+Lj3/XWeF4fsb9jd816tei3Cxt34uPRJPPG 2giFc6/NltuiAtmZhODZVQKV9dMgXcoW82nCNCbQrRE/qQK9WG8BnEzxOALwQoUqlRKu WIlQ== X-Gm-Message-State: ACgBeo26j7sYj7qcEvk5QCwp1463ad5HqWAEVUHwEbdE0ixWGlHfDzjJ sqtNGorv8JF+zFLAxFw6utk= X-Google-Smtp-Source: AA6agR756cwAW+1rpJa/742lq1VDxXUM43bfbsxmexdVtwjCmosk8qWr2LlRhlg2WBbAM7qrqWtnRg== X-Received: by 2002:a17:907:16ab:b0:731:55c0:e7a1 with SMTP id hc43-20020a17090716ab00b0073155c0e7a1mr2733898ejc.154.1660851109822; Thu, 18 Aug 2022 12:31:49 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r17-20020a1709061bb100b00731745a7e62sm1206806ejg.28.2022.08.18.12.31.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 12:31:49 -0700 (PDT) Message-ID: <6ea43d7f4b9595d15404bdca462dd8dc71fefea7.camel@gmail.com> From: Liliana Marie Prikler Date: Thu, 18 Aug 2022 21:31:48 +0200 In-Reply-To: <87mtc18ko9.fsf@trop.in> References: <87mtc18ko9.fsf@trop.in> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1660851187; 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: 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=PEA+6Xh3aifJk7CkO3RMg+BlJStisBQVimf2zAgBmvs=; b=heYw6mzzosXT/eRW/K23bT6czRH7b/nSejCspIYoGZB/ZxccoN7U6AIC9cBdnNPGHcnDdr SR6gP20zqsf/iE/BOD6TpXhv+7ToLxrmMu5RNjA9tJQygyzSDVlSUdClgocZU03yrgcl5m xXP5nnIgfO2g1vEgQr2POQDNRMq41MAJIoHCIwDQJLF8JxAMA0218Q5QnliFMTLbxt3xgc D6i3Uhy+C4zATVajW3T4bpnudig3eStZ01GbjWFOlVLQDBGRNwjUZv/gf6cVbewWU7yijA qiRxVSBtBoiaN8CHNJjzKK/DH68RpeDarRBN18QTtQMZUZHmCOiN7izGRiQW+w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1660851187; a=rsa-sha256; cv=none; b=HKG3YQfTx6/Yt4u7uE1DW4Of4HBbb38JRuobCvoYJDRrRRxGlYHaSMUdXlejF3DHTk0Um5 2+rNXf4Bd+TDmiSuPiC3iJgWGwdFrOlDEtgTHgvss6JBX/e9uakzwafaLILrxjLhFPHUVK 2VumLvrmujZcea1nEWO+WvOVMcXhNmTlbREVUlnAmSxdffpqMQWClXUOVDqOiF8mGxcd5h qUHeekcfojINgTZN1Jl59quGK9JtsrVNF1Quv5FAOWYe1DdaJqaeIvtixZmjvQMCRWdgq6 9Bs75lhD9CCkarXYre+BT7FDGgKYSKCm14ESmgjLPuqoPc/eI+VvtMSNsQVhRA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=CqaQgmuO; 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: 6.14 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=CqaQgmuO; 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: A018DF821 X-Spam-Score: 6.14 X-Migadu-Scanner: scn1.migadu.com X-TUID: g0Yp5UxZlWuH Hi Andrew, again for the mailing list. Am Donnerstag, dem 18.08.2022 um 17:50 +0300 schrieb Andrew Tropin: > > This patch adds a handy way for generating info documentation for > emacs packages from texinfo or org files. > > Andrew Tropin (3): > build-system: emacs: Add documentation-files argument. > gnu: emacs-orderless: Use documentation-files argument. > gnu: emacs-consult: Use documentation-files argument. Is it just those two packages that require this phase? If so, what value is there in making it a "standard" phase? > +(define (default-texinfo) > + "Return the default texinfo package." > + ;; Lazily resolve the binding to avoid a circular dependency. > + (let ((texinfo-mod (resolve-interface '(gnu packages texinfo)))) > + (module-ref texinfo-mod 'texinfo))) > + > (define* (lower name > #:key source inputs native-inputs outputs system > target > + documentation-files I don't think hard-coding this list is useful. Instead, it would be nice if we simply used find-files with the right pattern, and use a binary switch as in meson-build-systems #:glib-or-gtk? > + (texinfo (default-texinfo)) > (emacs (default-emacs)) > #:allow-other-keys > #:rest arguments) > @@ -77,6 +85,7 @@ (define private-keywords > ;; Keep the standard inputs of 'gnu-build- > system'. > ,@(standard-packages))) > (build-inputs `(("emacs" ,emacs) > + ,@(if (null? documentation-files) '() > `(("texinfo" ,texinfo))) > ,@native-inputs)) We should probably append rather than prepend implicit inputs. In fact, doing so for emacs itself also means that people could prepend their own emacs if emacs-minimal is not enough rather than needing a transformer. > +(define* (generate-docs #:key outputs documentation-files #:allow- > other-keys) > + "Convert texinfo or org files specified in DOCUMENTATION-FILES > argument to > +info files." > + (map > + (lambda (path) > + (if (or (string-suffix? ".texi" path) > + (string-suffix? ".texinfo" path) > + (string-suffix? ".txi" path)) > + (invoke "makeinfo" path) > + (emacs-batch-script ; else org file > + `(progn > + (require 'ox-texinfo) > + (find-file ,path) > + (org-texinfo-export-to-info))))) > + documentation-files)) (ice-9 match) is your friend. Cheers