* [bug#46235] [PATCH] gnu: emacs-rg: Fix use on remote systems.
@ 2021-02-01 12:47 Clément Lassieur
2021-02-02 8:27 ` Nicolas Goaziou
0 siblings, 1 reply; 3+ messages in thread
From: Clément Lassieur @ 2021-02-01 12:47 UTC (permalink / raw)
To: 46235
* gnu/packages/emacs-xyz.scm (emacs-rg)[inputs]: Remove. Move ripgrep to...
[propagated-inputs]: ... here. This also gives access to ripgrep's manual.
[arguments]: Replace the full path with the executable name.
---
gnu/packages/emacs-xyz.scm | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 28c7b41d79..ba1865d05f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19,7 +19,7 @@
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2017, 2018, 2019, 2020 Clément Lassieur <clement@lassieur.org>
+;;; Copyright © 2017, 2018, 2019, 2020, 2021 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017, 2018 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
@@ -3848,19 +3848,18 @@ result.")
(arguments
'(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'hardcode-rg-path
- ;; Hardcode the path to ripgrep.
+ (add-after 'unpack 'remove-rg-path
+ ;; Remove the path to ripgrep so that it works on remote systems.
(lambda _
(let ((file "rg.el"))
(chmod file #o644)
(emacs-substitute-sexps file
- ("(defcustom rg-executable" (which "rg")))))))))
+ ("(defcustom rg-executable" "rg"))))))))
(propagated-inputs
`(("emacs-s" ,emacs-s)
("emacs-transient" ,emacs-transient)
- ("emacs-wgrep" ,emacs-wgrep)))
- (inputs
- `(("ripgrep" ,ripgrep)))
+ ("emacs-wgrep" ,emacs-wgrep)
+ ("ripgrep" ,ripgrep)))
(home-page "https://rgel.readthedocs.io/en/latest/")
(synopsis "Search tool based on @code{ripgrep}")
(description
--
2.30.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#46235] [PATCH] gnu: emacs-rg: Fix use on remote systems.
2021-02-01 12:47 [bug#46235] [PATCH] gnu: emacs-rg: Fix use on remote systems Clément Lassieur
@ 2021-02-02 8:27 ` Nicolas Goaziou
2021-02-02 8:56 ` bug#46235: " Clément Lassieur
0 siblings, 1 reply; 3+ messages in thread
From: Nicolas Goaziou @ 2021-02-02 8:27 UTC (permalink / raw)
To: Clément Lassieur; +Cc: 46235
Hello,
Clément Lassieur <clement@lassieur.org> writes:
> * gnu/packages/emacs-xyz.scm (emacs-rg)[inputs]: Remove. Move ripgrep to...
> [propagated-inputs]: ... here. This also gives access to ripgrep's manual.
> [arguments]: Replace the full path with the executable name.
LGTM!
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#46235: [PATCH] gnu: emacs-rg: Fix use on remote systems.
2021-02-02 8:27 ` Nicolas Goaziou
@ 2021-02-02 8:56 ` Clément Lassieur
0 siblings, 0 replies; 3+ messages in thread
From: Clément Lassieur @ 2021-02-02 8:56 UTC (permalink / raw)
To: Nicolas Goaziou; +Cc: 46235-done
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
> Hello,
>
> Clément Lassieur <clement@lassieur.org> writes:
>
>> * gnu/packages/emacs-xyz.scm (emacs-rg)[inputs]: Remove. Move ripgrep to...
>> [propagated-inputs]: ... here. This also gives access to ripgrep's manual.
>> [arguments]: Replace the full path with the executable name.
>
> LGTM!
>
> Regards,
Thanks! Pushed
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-02 8:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-01 12:47 [bug#46235] [PATCH] gnu: emacs-rg: Fix use on remote systems Clément Lassieur
2021-02-02 8:27 ` Nicolas Goaziou
2021-02-02 8:56 ` bug#46235: " Clément Lassieur
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.