guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: emacs-ag: Propagate the-silver-searcher.


From: Clément Lassieur
Subject: 01/01: gnu: emacs-ag: Propagate the-silver-searcher.
Date: Fri, 12 May 2017 04:40:03 -0400 (EDT)

snape pushed a commit to branch master
in repository guix.

commit 864704212f4af3fba2ade784f9ac175bb685d53f
Author: Clément Lassieur <address@hidden>
Date:   Sat May 6 10:30:22 2017 +0200

    gnu: emacs-ag: Propagate the-silver-searcher.
    
    This allows emacs-ag to be used on remote systems.
    
    * gnu/packages/emacs.scm (emacs-ag)[inputs]: Remove.  Move 
THE-SILVER-SEARCHER
    to...
    [propagated-inputs]: ... here.
    [arguments]: Remove 'patch-exec-paths' phase.
---
 gnu/packages/emacs.scm | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 6e095ca..21120b3 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -1125,13 +1125,6 @@ than @code{electric-indent-mode}.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-before 'install 'patch-exec-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (emacs-substitute-variables "ag.el"
-               ("ag-executable"
-                (string-append (assoc-ref inputs "the-silver-searcher")
-                               "/bin/ag")))
-             #t))
          (add-before 'install 'make-info
            (lambda _
              (with-directory-excursion "docs"
@@ -1142,14 +1135,14 @@ than @code{electric-indent-mode}.")
                     (info (string-append out "/share/info")))
                (install-file "docs/_build/texinfo/agel.info" info)
                #t))))))
-    (inputs
-     `(("the-silver-searcher" ,the-silver-searcher)))
     (native-inputs
      `(("python-sphinx" ,python-sphinx)
        ("texinfo" ,texinfo)))
     (propagated-inputs
      `(("dash" ,emacs-dash)
-       ("s" ,emacs-s)))
+       ("s" ,emacs-s)
+       ;; We need to use 'ag' as the executable on remote systems.
+       ("the-silver-searcher" ,the-silver-searcher)))
     (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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]