[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#58213] [PATCH] gnu: emacs-ag: Do not propagate the-silver-searcher
From: |
Michael Rohleder |
Subject: |
[bug#58213] [PATCH] gnu: emacs-ag: Do not propagate the-silver-searcher and use gexp. |
Date: |
Sun, 02 Oct 2022 22:42:27 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) |
Hi Efraim!
Thanks for reviewing!
Efraim Flashner <efraim@flashner.co.il> writes:
> Can you split this into two patches? The first to not propagate the
> silver searcher and the second to switch to gexps? Thanks.
From 040aa27ca507032e8c02e02a90dc2e7aaecf4511 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@rohleder.de>
Date: Sun, 2 Oct 2022 22:01:17 +0200
Subject: [PATCH] gnu: emacs-ag: Use gexps.
* gnu/packages/emacs-xyz.scm (emacs-ag)[phases]: Use gexps.
{install-info}: Adjust for gexps.
---
gnu/packages/emacs-xyz.scm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 93ad1a6fbf..f907838dc8 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3026,17 +3026,17 @@ (define-public emacs-ag
(base32 "1p918y24vcn2pdliaymd210xp9fvhd4a1srqbv2lfiqrh59yjidx"))))
(build-system emacs-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'install 'make-info
- (lambda _
- (with-directory-excursion "docs"
- (invoke "make" "info"))))
- (add-after 'install 'install-info
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (info (string-append out "/share/info")))
- (install-file "docs/_build/texinfo/agel.info" info)))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'make-info
+ (lambda _
+ (with-directory-excursion "docs"
+ (invoke "make" "info"))))
+ (add-after 'install 'install-info
+ (lambda _
+ (install-file "docs/_build/texinfo/agel.info"
+ (string-append #$output "/share/info")))))))
(native-inputs
(list python-sphinx texinfo))
(propagated-inputs
--
2.37.3
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 <mike@rohleder.de>
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
--
I still maintain the point that designing a monolithic kernel in 1991 is a
fundamental error. Be thankful you are not my student. You would not get a
high grade for such a design :-)
(Andrew Tanenbaum to Linus Torvalds)
signature.asc
Description: PGP signature