From 329908236084c5ab3e37779bfef4400fdea9476e Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Sat, 23 Apr 2022 11:06:52 +0200 Subject: gnu: emacs-rg: Update to 2.2.0-0.444a8cc. * gnu/packages/emacs-xyz.scm (emacs-rg): Update to 2.2.0-0.444a8cc. Make sure default-directory is set when searching from result buffer. See https://github.com/dajva/rg.el/issues/139. --- gnu/packages/emacs-xyz.scm | 64 ++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 20ee373636..18e2b806af 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Arun Isaac ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe -;;; Copyright © 2017, 2018, 2019, 2020, 2021 Clément Lassieur +;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022 Clément Lassieur ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017, 2018 Kyle Meyer ;;; Copyright © 2017 Kei Kebreau @@ -4830,38 +4830,40 @@ result.") (license license:gpl2+))) (define-public emacs-rg - (package - (name "emacs-rg") - (version "2.2.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dajva/rg.el") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0a16g9phyy6c6vn5zfkpcpi90ixbx1ivp4wapwg189v77k2810by")))) - (build-system emacs-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (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" "rg")))))))) - (propagated-inputs - (list emacs-s emacs-transient emacs-wgrep ripgrep)) - (home-page "https://rgel.readthedocs.io/en/latest/") - (synopsis "Search tool based on @code{ripgrep}") - (description - "@code{rg} is an Emacs search package based on the @code{ripgrep} command + (let ((commit "444a8ccfea0b38452a0bc4c390a8ee01cfe30017") + (revision "0")) + (package + (name "emacs-rg") + (version (git-version "2.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dajva/rg.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nxzplpk5cf6hhr2v85bmg68i6am96shi2zq7m83fs96bilhwsp5")))) + (build-system emacs-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (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" "rg")))))))) + (propagated-inputs + (list emacs-s emacs-transient emacs-wgrep ripgrep)) + (home-page "https://rgel.readthedocs.io/en/latest/") + (synopsis "Search tool based on @code{ripgrep}") + (description + "@code{rg} is an Emacs search package based on the @code{ripgrep} command line tool. It allows one to interactively search based on the editing context then refine or modify the search results.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-inf-ruby (package -- cgit v1.2.3