From: "Jakub Kądziołka" <kuba@kadziolka.net>
To: 39445@debbugs.gnu.org
Subject: [bug#39445] [PATCH v2 1/2] gnu: ripgrep: Install the manpage.
Date: Sun, 9 Feb 2020 22:51:09 +0100 [thread overview]
Message-ID: <20200209215110.6755-1-kuba@kadziolka.net> (raw)
In-Reply-To: <20200205213650.12011-1-kuba@kadziolka.net>
* gnu/packages/rust-apps.scm (ripgrep)[native-inputs]: Add ASCIIDOC to
compile the manpage.
(ripgrep)[arguments]: Add phase: 'install-manpage. Add #:modules
argument to import (ice-9 match).
---
This patch no longer applies after #39500, so I'm sending a new version
to resolve the conflict. I have also added a second patch to the
patchstack that enables the PCRE2 feature, as sending it separately
would have some potential for generating merge conflicts.
gnu/packages/rust-apps.scm | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index d1d7d225a7..ddc9f6ed37 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -25,6 +25,7 @@
#:use-module (guix packages)
#:use-module (gnu packages compression)
#:use-module (gnu packages crates-io)
+ #:use-module (gnu packages documentation)
#:use-module (gnu packages jemalloc)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages tls)
@@ -226,7 +227,24 @@ provides defaults for 80% of the use cases.")
("rust-termcolor" ,rust-termcolor-1.0))
#:cargo-development-inputs
(("rust-serde" ,rust-serde-1.0)
- ("rust-serde-derive" ,rust-serde-derive-1.0))))
+ ("rust-serde-derive" ,rust-serde-derive-1.0))
+ #:modules ((ice-9 match)
+ (guix build cargo-build-system)
+ (guix build utils))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'build 'install-manpage
+ ;; NOTE: This is done before 'check so that there's only one output
+ ;; directory with the man page.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (match (find-files "target" "^rg\\.1$")
+ ((manpage)
+ (install-file manpage (string-append
+ (assoc-ref outputs "out")
+ "/share/man/man1"))))
+ #t)))))
+ (native-inputs
+ `(("asciidoc" ,asciidoc)))
(home-page "https://github.com/BurntSushi/ripgrep")
(synopsis "Line-oriented search tool")
(description
--
2.25.0
next prev parent reply other threads:[~2020-02-09 21:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 21:36 [bug#39445] [PATCH] gnu: ripgrep: Install the manpage Jakub Kądziołka
2020-02-09 21:51 ` Jakub Kądziołka [this message]
2020-02-09 21:51 ` [bug#39445] [PATCH v2 2/2] gnu: ripgrep: enable the 'pcre2' feature Jakub Kądziołka
2020-02-10 8:43 ` Efraim Flashner
2020-02-10 11:28 ` Jakub Kądziołka
2020-02-11 18:25 ` bug#39445: " Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200209215110.6755-1-kuba@kadziolka.net \
--to=kuba@kadziolka.net \
--cc=39445@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).