From patchwork Sun Feb 9 21:51:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 20201 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 8D83817AF9; Sun, 9 Feb 2020 21:52:12 +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 5830317A2F for ; Sun, 9 Feb 2020 21:52:12 +0000 (GMT) Received: from localhost ([::1]:54672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j0uUt-0002CE-UH for patchwork@mira.cbaines.net; Sun, 09 Feb 2020 16:52:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45984) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j0uUm-0002AA-C3 for guix-patches@gnu.org; Sun, 09 Feb 2020 16:52:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j0uUk-0001fC-SQ for guix-patches@gnu.org; Sun, 09 Feb 2020 16:52:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47364) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j0uUk-0001ek-P1 for guix-patches@gnu.org; Sun, 09 Feb 2020 16:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j0uUj-0008OL-NF for guix-patches@gnu.org; Sun, 09 Feb 2020 16:52:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39445] [PATCH v2 1/2] gnu: ripgrep: Install the manpage. References: <20200205213650.12011-1-kuba@kadziolka.net> In-Reply-To: <20200205213650.12011-1-kuba@kadziolka.net> Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2020 21:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39445 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39445@debbugs.gnu.org Received: via spool by 39445-submit@debbugs.gnu.org id=B39445.158128506732183 (code B ref 39445); Sun, 09 Feb 2020 21:52:01 +0000 Received: (at 39445) by debbugs.gnu.org; 9 Feb 2020 21:51:07 +0000 Received: from localhost ([127.0.0.1]:53334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j0uTq-0008N1-Ms for submit@debbugs.gnu.org; Sun, 09 Feb 2020 16:51:06 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:51736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j0uTn-0008Mb-Gk for 39445@debbugs.gnu.org; Sun, 09 Feb 2020 16:51:05 -0500 Received: (qmail 2817 invoked by uid 1009); 9 Feb 2020 22:51:00 +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/25718. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.019945 secs); 09 Feb 2020 21:51:00 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 9 Feb 2020 22:51:00 +0100 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Date: Sun, 9 Feb 2020 22:51:09 +0100 Message-Id: <20200209215110.6755-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-Qmailux-2.08st: added fake Content-Type header 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). --- 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