From patchwork Wed Feb 5 21:36:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 20142 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BAB01168D1; Wed, 5 Feb 2020 21:37:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7C763168BE for ; Wed, 5 Feb 2020 21:37:11 +0000 (GMT) Received: from localhost ([::1]:57242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izSMB-0003Ls-09 for patchwork@mira.cbaines.net; Wed, 05 Feb 2020 16:37:11 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#39445] [PATCH] gnu: ripgrep: Install the manpage. Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Feb 2020 21:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39445 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39445@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15809385932223 (code B ref -1); Wed, 05 Feb 2020 21:37:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Feb 2020 21:36:33 +0000 Received: from localhost ([127.0.0.1]:46894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1izSLZ-0000Zn-59 for submit@debbugs.gnu.org; Wed, 05 Feb 2020 16:36:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:45742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1izSLX-0000Zd-1X for submit@debbugs.gnu.org; Wed, 05 Feb 2020 16:36:32 -0500 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 Received: (qmail 20449 invoked by uid 1009); 5 Feb 2020 22:36:21 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25716. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.043023 secs); 05 Feb 2020 21:36:21 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 5 Feb 2020 22:36:21 +0100 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Date: Wed, 5 Feb 2020 22:36:50 +0100 Message-Id: <20200205213650.12011-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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