From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id UO1LHMVFdmUIRQAAG6o9tA:P1 (envelope-from ) for ; Mon, 11 Dec 2023 00:12:05 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id UO1LHMVFdmUIRQAAG6o9tA (envelope-from ) for ; Mon, 11 Dec 2023 00:12:05 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=runbox.com header.s=selector2 header.b=fQ16ZOwc; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1702249925; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=3tBih4ww9aK9s7naP6g/AelEL/hx87GuXVaqPtBFbHA=; b=EQfb/jpCAB3Db6HSWa7XYz6tn2akgZm/OCbVi3VjP+1EwG/9d/G9Z/CHnLeh+b4T39Yw/M FoJ9Dwrn694kc6unkfTmgGpohrbogWyU9yimVi7JILXUWBgBhjWuJOSBx3/8Jy95B0ysyz WGU+hm2DRUktK8veyR+h+0EXsvn6kJvKtbswnbZoYchLWLI6xOZiYHlKcxw/V+q7+pXpcV OsggnZ4yZeCwsEtIJCoXLKddAskg3EYR2dSA8kPH4HwYUW6E3AEPlBBYfiwKCaTEyYJHLz UfbX1AZDaB1t2BCmik4zwqF/4u4O2/wGLkiWNUvthE1cn5BJQZ6l1q0Il1fptQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=runbox.com header.s=selector2 header.b=fQ16ZOwc; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1702249925; a=rsa-sha256; cv=none; b=PQZUWL336eSFmxjVfvPafQEaSv3kLiUWVxCyUnEAyc3CqPqZHnGLhvUGxu/fvvKCSwdjYj q12xYRojPlK/rDEhmW3FGTQwt2FoRQsDSR0h/DE2pzHc4wwI/slpt7FR3z+OUytJ5pkNL1 euriEh3G9LykvbqrQjf/O9lV8Ju7XNC1ue1czFj8VpOU2Wh4aV/oOjiuqdl6LgTMSQxP1j ZZw8qnN/AG3Pf0rqcGifUEvNOOodi2v+sF9T662ASU3+G5B7SosF76S8QwfeSAnfT0Uxso plfn2n3BCDxKZDctor6E76FoAXYkYdwp2scLUHVMyz2Hn9bkTPisaG/z0F9dsg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1FF82550EA for ; Mon, 11 Dec 2023 00:12:05 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rCSxh-0001cZ-3j; Sun, 10 Dec 2023 18:11:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rCSxg-0001cP-Ay for guix-patches@gnu.org; Sun, 10 Dec 2023 18:11:48 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rCSxg-0004xG-1r for guix-patches@gnu.org; Sun, 10 Dec 2023 18:11:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rCSxu-0000Ut-E6; Sun, 10 Dec 2023 18:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67757] [PATCH 19/19] gnu: ripgrep: Update to 14.0.3. Resent-From: Jaeme Sifat Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Sun, 10 Dec 2023 23:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67757 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67757@debbugs.gnu.org Cc: Jaeme Sifat , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 67757-submit@debbugs.gnu.org id=B67757.17022499011855 (code B ref 67757); Sun, 10 Dec 2023 23:12:02 +0000 Received: (at 67757) by debbugs.gnu.org; 10 Dec 2023 23:11:41 +0000 Received: from localhost ([127.0.0.1]:52048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCSxZ-0000Tr-AE for submit@debbugs.gnu.org; Sun, 10 Dec 2023 18:11:41 -0500 Received: from mailtransmit04.runbox.com ([2a0c:5a00:149::25]:54922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCSxX-0000Ta-3R for 67757@debbugs.gnu.org; Sun, 10 Dec 2023 18:11:39 -0500 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1rCSxD-008tLw-02 for 67757@debbugs.gnu.org; Mon, 11 Dec 2023 00:11:19 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=selector2; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To :Message-ID:Date:Subject:Cc:To:From; bh=3tBih4ww9aK9s7naP6g/AelEL/hx87GuXVaqPtBFbHA=; b=fQ16ZOwc8oKrWoFV+YWN5UtRfB Dje6mqyf8/gZ7lBsRzoJ18+hldookppodE0o7Pp/IpGlqaaWozZybNc60yuoTYGjRK1W3J9WOQ3tf R6bnMVap3l7YFZhBZ8vjx3sh8Og0b/emtHg6PxYBMpxwo3wmL+0H0iuu2DGjT+pXL1J/FiKVOHnNf AgdoZGiWBpmbz15HvbVBH3OeyAz6TFDHFi3I12/+SuAVcYC05/rLVQt0vfOyMCXqmfEGYnVpLS4qz I1X2RpsV9KfFC2HOTx2MmcoY8czf9CJG8kESTBUctaSB82GbU++BvKwplgybA+NIk/8P1l2Z+dy1E v0f1eJ3g==; Received: from [10.9.9.72] (helo=submission01.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1rCSxC-0000eU-LS for 67757@debbugs.gnu.org; Mon, 11 Dec 2023 00:11:18 +0100 Received: by submission01.runbox with esmtpsa [Authenticated ID (1176697)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rCSwu-00C6y9-Uk; Mon, 11 Dec 2023 00:11:01 +0100 Date: Sun, 10 Dec 2023 18:07:00 -0500 Message-ID: <0eed37f8de6d7016ece990ab08c6b5de76fd3022.1702248679.git.jaeme@runbox.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jaeme Sifat X-ACL-Warn: , Jaeme Sifat via Guix-patches From: Jaeme Sifat via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -1.51 X-Spam-Score: -1.51 X-Migadu-Queue-Id: 1FF82550EA X-TUID: phi29KPGmEyn Upstream developers have decided to move documentation generations and completions as generated output of the built binary itself. This presents an outstanding problem for cross-compilation. Either this can be fixed in a later patch or upstream can be contacted to reverse the change in a later version. * gnu/packages/rust-apps.scm (ripgrep): Update to 14.0.3. Change-Id: Iedf371a36d704072f4f3a9a3765c77dd22ea6642 --- gnu/packages/rust-apps.scm | 107 +++++++++++++++++++++---------------- 1 file changed, 61 insertions(+), 46 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index ab8534f64a..b99186c4e1 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1149,61 +1149,76 @@ (define-public maturin (define-public ripgrep (package (name "ripgrep") - (version "13.0.0") + (version "14.0.3") (source (origin (method url-fetch) (uri (crate-uri "ripgrep" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1gv4imhjgxmyxaa996yshcjlakmrjw9pf4rycp90pq675cn9sz7k")))) + (base32 "192n1lih9vzhf7r2ak985fap23x608qjdq9pqjcf43h3g9mjzjh0")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-bstr" ,rust-bstr-0.2) - ("rust-clap" ,rust-clap-2) - ("rust-grep" ,rust-grep-0.2) - ("rust-ignore" ,rust-ignore-0.4) - ("rust-jemallocator" ,rust-jemallocator-0.3) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-log" ,rust-log-0.4) - ("rust-num-cpus" ,rust-num-cpus-1) - ("rust-regex" ,rust-regex-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-termcolor" ,rust-termcolor-1)) - #:cargo-development-inputs - (("rust-serde" ,rust-serde-1) - ("rust-serde-derive" ,rust-serde-derive-1) - ("rust-walkdir" ,rust-walkdir-2)) - #:modules ((ice-9 match) - (guix build cargo-build-system) - (guix build utils)) - #:install-source? #f - #: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))) - #:features '("pcre2"))) - (inputs - (list pcre2)) - (native-inputs - (list asciidoc pkg-config)) + (list + #:cargo-inputs `(("rust-anyhow" ,rust-anyhow-1) + ("rust-bstr" ,rust-bstr-1) + ("rust-grep" ,rust-grep-0.3) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-jemallocator" ,rust-jemallocator-0.5) + ("rust-lexopt" ,rust-lexopt-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-textwrap" ,rust-textwrap-0.16)) + #:cargo-development-inputs `(("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-walkdir" ,rust-walkdir-2)) + #:install-source? #f + ;; Note: the built target 'rg' binary is required for 'install-extras + #:phases #~(modify-phases %standard-phases + (add-after 'install 'install-extras + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (bash-completions-dir (string-append share + "/bash-completion/completions")) + (zsh-completions-dir (string-append share + "/zsh/site-functions")) + (fish-completions-dir (string-append share + "/fish/vendor_completions.d")) + (man1 (string-append share "/man/man1")) + (rg (string-append out "/bin/rg"))) + (unless #$(%current-target-system) + (mkdir-p man1) + (with-output-to-file (string-append man1 "/rg.1") + (lambda _ + (invoke rg "--generate" "man"))) + (mkdir-p bash-completions-dir) + (with-output-to-file (string-append + bash-completions-dir "/rg") + (lambda _ + (invoke rg "--generate" "complete-bash"))) + (mkdir-p zsh-completions-dir) + (with-output-to-file (string-append + zsh-completions-dir "/_rg") + (lambda _ + (invoke rg "--generate" "complete-zsh"))) + (mkdir-p fish-completions-dir) + (with-output-to-file (string-append + fish-completions-dir + "/rg.fish") + (lambda _ + (invoke rg "--generate" "complete-fish")))))))) + #:features '(list "pcre2"))) + (inputs (list pcre2)) + (native-inputs (list pkg-config)) (home-page "https://github.com/BurntSushi/ripgrep") - (synopsis "Line-oriented search tool") + (synopsis "Line-oriented search tool and Rust successor to @command{grep}") (description - "ripgrep is a line-oriented search tool that recursively searches -your current directory for a regex pattern while respecting your -gitignore rules.") + "@code{ripgrep} (@command{rg}) is a line-oriented search tool that +recursively searches your current directory for a regex pattern while +respecting your gitignore rules. @code{ripgrep} is similar to other popular +search tools like The Silver Searcher, @command{ack} and @command{grep}.") (license (list license:unlicense license:expat)))) (define-public rot8 -- 2.41.0