From patchwork Sun Oct 2 20:42:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rohleder X-Patchwork-Id: 43117 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 DC66727BBEA; Sun, 2 Oct 2022 21:44:13 +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 2346327BBE9 for ; Sun, 2 Oct 2022 21:44:13 +0100 (BST) Received: from localhost ([::1]:38206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1of5oq-0008Gn-9n for patchwork@mira.cbaines.net; Sun, 02 Oct 2022 16:44:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1of5og-0008FX-T0 for guix-patches@gnu.org; Sun, 02 Oct 2022 16:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1of5og-00082o-KO for guix-patches@gnu.org; Sun, 02 Oct 2022 16:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1of5og-0005bl-Ai for guix-patches@gnu.org; Sun, 02 Oct 2022 16:44: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: Sun, 02 Oct 2022 20:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58213 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner Cc: 58213@debbugs.gnu.org Received: via spool by 58213-submit@debbugs.gnu.org id=B58213.166474341121470 (code B ref 58213); Sun, 02 Oct 2022 20:44:02 +0000 Received: (at 58213) by debbugs.gnu.org; 2 Oct 2022 20:43:31 +0000 Received: from localhost ([127.0.0.1]:48175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1of5oA-0005Zn-F4 for submit@debbugs.gnu.org; Sun, 02 Oct 2022 16:43:30 -0400 Received: from wp224.webpack.hosteurope.de ([80.237.132.231]:51118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1of5o8-0005Zb-Jt for 58213@debbugs.gnu.org; Sun, 02 Oct 2022 16:43:29 -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 1of5o5-0007oe-U2; Sun, 02 Oct 2022 22:43:25 +0200 Received: from [192.168.1.3] (helo=micha) by www.rohleder.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1of5n9-000aky-8Y; Sun, 02 Oct 2022 22:43:25 +0200 From: Michael Rohleder References: <20221001053316.731-1-mike@rohleder.de> Date: Sun, 02 Oct 2022 22:42:27 +0200 In-Reply-To: (Efraim Flashner's message of "Sun, 2 Oct 2022 21:14:01 +0300") Message-ID: <8735c6t0ss.fsf@rohleder.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1664743408;ada63807; X-HE-SMSGID: 1of5o5-0007oe-U2 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 Hi Efraim! Thanks for reviewing! Efraim Flashner writes: > Can you split this into two patches? The first to not propagate the > silver searcher and the second to switch to gexps? Thanks. This applies to the first one. I changed emacs-substitute-sexps to emacs-substitute-variables. From f3ace8a1daa1a40c90c08043df42d0af4864e5cb Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 2 Oct 2022 22:25:56 +0200 Subject: [PATCH] gnu: emacs-ag: Do not propagate the-silver-searcher. * gnu/packages/emacs-xyz.scm (emacs-ag)[phases]: Add phase substitute-ag-path to avoid propagating ag. [inputs]: Add the-silver-searcher. [propagated-inputs]: Remove the-silver-searcher. --- gnu/packages/emacs-xyz.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f907838dc8..ff2d45500e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3029,6 +3029,11 @@ (define-public emacs-ag (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'substitute-ag-path + (lambda _ + (make-file-writable "ag.el") + (emacs-substitute-variables "ag.el" + ("ag-executable" (which "ag"))))) (add-before 'install 'make-info (lambda _ (with-directory-excursion "docs" @@ -3037,12 +3042,11 @@ (define-public emacs-ag (lambda _ (install-file "docs/_build/texinfo/agel.info" (string-append #$output "/share/info"))))))) + (inputs (list the-silver-searcher)) (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 -- 2.37.3