GNU bug report logs - #49450
[PATCH] gnu: emacs-deadgrep: Add missing input.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 49450 in the body.
You can then email your comments to 49450 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Matthew James Kraai <kraai <at> ftbfs.org>
To: guix-patches <at> gnu.org
Cc: Matthew James Kraai <kraai <at> ftbfs.org>
Subject: [PATCH] gnu: emacs-deadgrep: Add missing input.
Date: Tue,  6 Jul 2021 20:18:10 -0700

* gnu/packages/emacs-xyz.scm (emacs-deadgrep)[propagated-inputs]: Add
ripgrep.
---
 gnu/packages/emacs-xyz.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Add ripgrep as propagated-input, as is done for emacs-ripgrep and emacs-rg.

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 9591a4e6e7..029b20ee72 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -20805,7 +20805,8 @@ accept and reject GitHub pull requests.")
       (propagated-inputs
        `(("emacs-dash" ,emacs-dash)
          ("emacs-s" ,emacs-s)
-         ("emacs-spinner" ,emacs-spinner)))
+         ("emacs-spinner" ,emacs-spinner)
+         ("ripgrep" ,ripgrep)))
       (home-page "https://github.com/Wilfred/deadgrep")
       (synopsis "Frontend for @code{ripgrep}")
       (description "This package provides an Emacs interface for performing
-- 
2.32.0

Message #8 received at 49450 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Matthew James Kraai <kraai <at> ftbfs.org>
Cc: 49450 <at> debbugs.gnu.org
Subject: Re: [bug#49450] [PATCH] gnu: emacs-deadgrep: Add missing input.
Date: Wed, 07 Jul 2021 16:20:43 +0200

Hello,

Matthew James Kraai <kraai <at> ftbfs.org> writes:

> * gnu/packages/emacs-xyz.scm (emacs-deadgrep)[propagated-inputs]: Add
> ripgrep.
> ---
>  gnu/packages/emacs-xyz.scm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> Add ripgrep as propagated-input, as is done for emacs-ripgrep and
> emacs-rg.

I think ripgrep should be an input.  Both emacs-ripgrep and emacs-rg
needs to be fixed, too.

Regards,
-- 
Nicolas Goaziou

Message #11 received at 49450 <at> debbugs.gnu.org (full text, mbox):

From: Matthew Kraai <kraai <at> ftbfs.org>
To: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Cc: 49450 <at> debbugs.gnu.org
Subject: Re: [bug#49450] [PATCH] gnu: emacs-deadgrep: Add missing input.
Date: Wed, 7 Jul 2021 08:42:55 -0700

Hi Nicolas,

I was trying to ensure that when emacs-deadgrep is installed, ripgrep is also installed.  The former doesn’t need the latter to build but does require it at runtime.  Isn’t propagated-inputs the right field for that?

Sent from my iPhone

> On Jul 7, 2021, at 7:20 AM, Nicolas Goaziou <mail <at> nicolasgoaziou.fr> wrote:
> 
> Hello,
> 
> Matthew James Kraai <kraai <at> ftbfs.org> writes:
> 
>> * gnu/packages/emacs-xyz.scm (emacs-deadgrep)[propagated-inputs]: Add
>> ripgrep.
>> ---
>> gnu/packages/emacs-xyz.scm | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>> 
>> Add ripgrep as propagated-input, as is done for emacs-ripgrep and
>> emacs-rg.
> 
> I think ripgrep should be an input.  Both emacs-ripgrep and emacs-rg
> needs to be fixed, too.
> 
> Regards,
> -- 
> Nicolas Goaziou

Message #14 received at 49450 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Matthew Kraai <kraai <at> ftbfs.org>
Cc: 49450 <at> debbugs.gnu.org
Subject: Re: [bug#49450] [PATCH] gnu: emacs-deadgrep: Add missing input.
Date: Wed, 07 Jul 2021 17:53:06 +0200

Matthew Kraai <kraai <at> ftbfs.org> writes:

> I was trying to ensure that when emacs-deadgrep is installed, ripgrep
> is also installed. The former doesn’t need the latter to build but
> does require it at runtime. Isn’t propagated-inputs the right field
> for that?

Inputs are also available at runtime, but do not clobber user's profile.
It's preferable to use them, when it's reasonably possible.

In this case, it means you just need to modify the Elisp source to make
sure code points to the right ripgrep executable in the store. See,
e.g., emacs-flycheck-grammalecte.

Message #17 received at 49450 <at> debbugs.gnu.org (full text, mbox):

From: Matthew James Kraai <kraai <at> ftbfs.org>
To: 49450 <at> debbugs.gnu.org
Cc: Matthew James Kraai <kraai <at> ftbfs.org>
Subject: [PATCH] gnu: emacs-deadgrep: Add missing input.
Date: Wed,  7 Jul 2021 16:56:24 -0700

* gnu/packages/emacs-xyz.scm (emacs-deadgrep)[inputs]: Add ripgrep.
[arguments]: Add configure phase to set deadgrep-executable to absolute path.
---
 gnu/packages/emacs-xyz.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 9591a4e6e7..fd7f1b54d3 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -20802,10 +20802,25 @@ accept and reject GitHub pull requests.")
           (base32
            "1vjhrq02l8gvdn2haygzq7277hnhjchs9xrfpcnh76gqip200gx4"))))
       (build-system emacs-build-system)
+      (inputs `(("ripgrep" ,ripgrep)))
       (propagated-inputs
        `(("emacs-dash" ,emacs-dash)
          ("emacs-s" ,emacs-s)
          ("emacs-spinner" ,emacs-spinner)))
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'configure
+             (lambda* (#:key inputs #:allow-other-keys)
+               (let ((ripgrep (assoc-ref inputs "ripgrep")))
+                 ;; .el is read-only in git.
+                 (chmod "deadgrep.el" #o644)
+                 ;; Specify the absolute file names of rg so that everything
+                 ;; works out-of-the-box.
+                 (emacs-substitute-variables
+                     "deadgrep.el"
+                   ("deadgrep-executable"
+                    (string-append ripgrep "/bin/rg")))))))))
       (home-page "https://github.com/Wilfred/deadgrep")
       (synopsis "Frontend for @code{ripgrep}")
       (description "This package provides an Emacs interface for performing
-- 
2.32.0

Message #22 received at 49450-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Matthew James Kraai <kraai <at> ftbfs.org>
Cc: 49450-done <at> debbugs.gnu.org
Subject: Re: [bug#49450] [PATCH] gnu: emacs-deadgrep: Add missing input.
Date: Thu, 08 Jul 2021 09:33:30 +0200

Hello,

Matthew James Kraai <kraai <at> ftbfs.org> writes:

> * gnu/packages/emacs-xyz.scm (emacs-deadgrep)[inputs]: Add ripgrep.
> [arguments]: Add configure phase to set deadgrep-executable to
> absolute path.

Thank you.

> +                 ;; .el is read-only in git.
> +                 (chmod "deadgrep.el" #o644)

I used `make-file-writable' function instead of chmod.

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.