From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:49386) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izSM3-0003GY-Ib for guix-patches@gnu.org; Wed, 05 Feb 2020 16:37:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1izSM2-00072W-BV for guix-patches@gnu.org; Wed, 05 Feb 2020 16:37:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40921) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1izSM2-000725-7D for guix-patches@gnu.org; Wed, 05 Feb 2020 16:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1izSM2-0000aV-5L for guix-patches@gnu.org; Wed, 05 Feb 2020 16:37:02 -0500 Subject: [bug#39445] [PATCH] gnu: ripgrep: Install the manpage. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:49004) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izSLR-0002EF-Jo for guix-patches@gnu.org; Wed, 05 Feb 2020 16:36:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1izSLP-0005HC-Kf for guix-patches@gnu.org; Wed, 05 Feb 2020 16:36:25 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:42604) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1izSLP-0005B3-AV for guix-patches@gnu.org; Wed, 05 Feb 2020 16:36:23 -0500 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Date: Wed, 5 Feb 2020 22:36:50 +0100 Message-Id: <20200205213650.12011-1-kuba@kadziolka.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39445@debbugs.gnu.org * 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). --- gnu/packages/rust-apps.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 90bd146442..b73efc08d9 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 John Soo ;;; Copyright © 2019, 2020 Efraim Flashner +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,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 pkg-config) #:use-module (gnu packages tls) #:use-module (gnu packages version-control)) @@ -58,7 +60,24 @@ (("rust-clap" ,rust-clap-2) ("rust-lazy-static" ,rust-lazy-static-1.3) ("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