From patchwork Sat Oct 1 05:33:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rohleder X-Patchwork-Id: 43090 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 564E427BBEA; Sat, 1 Oct 2022 06:35:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1A2B427BBE9 for ; Sat, 1 Oct 2022 06:35:12 +0100 (BST) Received: from localhost ([::1]:44128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeV9b-0003r1-7C for patchwork@mira.cbaines.net; Sat, 01 Oct 2022 01:35:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeV9S-0003qg-Ol for guix-patches@gnu.org; Sat, 01 Oct 2022 01:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44353) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oeV9S-0006wG-Ap for guix-patches@gnu.org; Sat, 01 Oct 2022 01:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oeV9S-0000tF-3i for guix-patches@gnu.org; Sat, 01 Oct 2022 01:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58213] [PATCH] gnu: emacs-ag: Do not propagate the-silver-searcher and use gexp. Resent-From: Michael Rohleder Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Oct 2022 05:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58213 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58213@debbugs.gnu.org Cc: Michael Rohleder X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16646024673362 (code B ref -1); Sat, 01 Oct 2022 05:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Oct 2022 05:34:27 +0000 Received: from localhost ([127.0.0.1]:43427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oeV8t-0000sA-63 for submit@debbugs.gnu.org; Sat, 01 Oct 2022 01:34:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:58460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oeV8m-0000rx-N0 for submit@debbugs.gnu.org; Sat, 01 Oct 2022 01:34:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeV8m-0003o0-I9 for guix-patches@gnu.org; Sat, 01 Oct 2022 01:34:20 -0400 Received: from wp224.webpack.hosteurope.de ([2a01:488:42:1000:50ed:84e7::]:34966) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeV8k-0006ss-JB for guix-patches@gnu.org; Sat, 01 Oct 2022 01:34:20 -0400 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1oeV8h-0004pW-Sd; Sat, 01 Oct 2022 07:34:15 +0200 Received: from [192.168.1.3] (helo=micha.rohleder.de) by www.rohleder.de with esmtp (Exim 4.95) (envelope-from ) id 1oeV7m-000Mej-8K; Sat, 01 Oct 2022 07:34:15 +0200 From: Michael Rohleder Date: Sat, 1 Oct 2022 07:33:16 +0200 Message-Id: <20221001053316.731-1-mike@rohleder.de> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1664602458;bd5bc7a7; X-HE-SMSGID: 1oeV8h-0004pW-Sd Received-SPF: permerror client-ip=2a01:488:42:1000:50ed:84e7::; envelope-from=mike@rohleder.de; helo=wp224.webpack.hosteurope.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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/emacs-xyz.scm (emacs-ag)[phases]: Use gexps. {substitute-ag-path}: Add phase to avoid propagating ag. {install-info}: Use gexps. [inputs]: Add the-silver-searcher. [propagated-inputs]: Remove the-silver-searcher. --- gnu/packages/emacs-xyz.scm | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6d9d0d6a8f..76a17da88e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3026,23 +3026,27 @@ (define-public emacs-ag (base32 "1p918y24vcn2pdliaymd210xp9fvhd4a1srqbv2lfiqrh59yjidx")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'make-info - (lambda _ - (with-directory-excursion "docs" - (invoke "make" "info")))) - (add-after 'install 'install-info - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (info (string-append out "/share/info"))) - (install-file "docs/_build/texinfo/agel.info" info))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'substitute-ag-path + (lambda _ + (make-file-writable "ag.el") + (emacs-substitute-sexps "ag.el" + ("defcustom ag-executable" (which "ag"))))) + (add-before 'install 'make-info + (lambda _ + (with-directory-excursion "docs" + (invoke "make" "info")))) + (add-after 'install 'install-info + (lambda _ + (install-file "docs/_build/texinfo/agel.info" + (string-append #$output "/share/info"))))))) + (inputs (list the-silver-searcher)) ;'ag' executable (native-inputs (list python-sphinx texinfo)) (propagated-inputs - (list emacs-dash - emacs-s - the-silver-searcher)) ;'ag' executable + (list emacs-dash emacs-s)) (home-page "https://github.com/Wilfred/ag.el") (synopsis "Front-end for ag (the-silver-searcher) for Emacs") (description "This package provides the ability to use the silver