From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id sHweANlnj2XuTwAAkFu2QA (envelope-from ) for ; Sat, 30 Dec 2023 01:44:09 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id wP4hONhnj2WAYgAAqHPOHw (envelope-from ) for ; Sat, 30 Dec 2023 01:44:08 +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=lVqHVkf7; 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=1703897048; 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=6Iahai1WoQA5coMH9UZTVQ6wrsjmvm3p2IhsK1n0BYI=; b=pAU0lXBzEllDJo97YJFE2KeqfwtNTuHzqifOxDbIPfYS4G+7/MOXs3XNgXGdU/wYHVzVDS lXUqOxK+Kqg61q8joYyKV9+6sPQYBrlfvZHtbQbYEeABLJCELpFlAspoKvOaHlwLuZm+KK k7jq8RQ0Z2tY6dZFAWjIcFE8G3pFxEKHccIhblXuGE09fHKhKHABpC9L7Xdy6y97jKdhYK erjCUF94WkqGa1TiWW0S8/4r7Chig4RYMeIUr4W+z5VI497Fqcj0rrQjwUy3SyuJL3fAyM jKo82lxW9yNZAVUuKL9gEem+0+R6rpWgHg3CNxZz6R3h/yVSij/IxnvSZHsuwA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1703897048; a=rsa-sha256; cv=none; b=Lv4zNjBOsX9COwmuo+S7FRBi5uL8uyoljp6rMEiHTjDmC7F1pg8Uu11GTLDU6gnQnsge+T NCTZ3KVWamSWC98uYZdlvejeBWa1xcd/9zV9S6wSqREhN6Mk9Amuobs0lghZvfBEKU17bB 2n2/wgIZdU0uXKdS+DNu99PUoANJbBqzdbwM8xcRKNFc7nsUWrlG7NltFlx0DiG+gFjnTc ZOKp2KNTlAnP217Mj3B8FD7CWUT0VMGkmbOBbQQ+/yOlqUmeZwxW0wqNO8LKbT+sZQFfGJ QAuemm2fd/sWpRevC451FMAz11wyhUP5WDDg52ClnEHIfPL6d6QRf5WmPEL4+w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=runbox.com header.s=selector2 header.b=lVqHVkf7; 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 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 BB98320694 for ; Sat, 30 Dec 2023 01:44:08 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJNRW-0005S8-9d; Fri, 29 Dec 2023 19:43:10 -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 1rJNRR-0005Qa-HT for guix-patches@gnu.org; Fri, 29 Dec 2023 19:43:06 -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 1rJNRR-0002Zj-9C for guix-patches@gnu.org; Fri, 29 Dec 2023 19:43:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJNRR-0003FJ-De; Fri, 29 Dec 2023 19:43:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68115] [PATCH 18/18] gnu: bat: Update to 0.24.0. Resent-From: Jaeme Sifat Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 00:43:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68115 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68115@debbugs.gnu.org Cc: Jaeme Sifat , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 68115-submit@debbugs.gnu.org id=B68115.170389695912316 (code B ref 68115); Sat, 30 Dec 2023 00:43:05 +0000 Received: (at 68115) by debbugs.gnu.org; 30 Dec 2023 00:42:39 +0000 Received: from localhost ([127.0.0.1]:42551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJNR0-0003CY-49 for submit@debbugs.gnu.org; Fri, 29 Dec 2023 19:42:38 -0500 Received: from mailtransmit04.runbox.com ([2a0c:5a00:149::25]:58974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJNQe-0003AA-S7 for 68115@debbugs.gnu.org; Fri, 29 Dec 2023 19:42:18 -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 1rJNQY-005i74-EN for 68115@debbugs.gnu.org; Sat, 30 Dec 2023 01:42:10 +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=6Iahai1WoQA5coMH9UZTVQ6wrsjmvm3p2IhsK1n0BYI=; b=lVqHVkf7gi6YKJR3NjbwqlP7va aUxTXlN0B718cTiMgkBjnFQePr8SEztDvvBt3xCiIms96BK2NrFIb/wNpAO/Zi1I0rI7KjFJTteW+ g2Y70ip36sIySwUrkXekBlelDuy6RSMo9Bx/RoBJLtReE1hQflZVtpGzd8m9ncxUMRpk/44927B2t 2J8ZOoxFlvqAyz2zTaUwcbW1M5QcO2mjP75DQ8OrcigplaV6jg7waoUV45DSKhay0uCYXqIenkBra BDrUJfB53HOmBOnK7JG9/5g2ulSs7hKB8fR6ZBvrVhbkCG8WjHJ3h5Hii7b2VjaAKb+uGXQeUnO4H R/ohcvUA==; Received: from [10.9.9.74] (helo=submission03.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1rJNQY-0003vy-40 for 68115@debbugs.gnu.org; Sat, 30 Dec 2023 01:42:10 +0100 Received: by submission03.runbox with esmtpsa [Authenticated ID (1176697)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rJNQR-006mmw-CH; Sat, 30 Dec 2023 01:42:03 +0100 Date: Fri, 29 Dec 2023 19:40:29 -0500 Message-ID: <1f681ddcdbcaecfff7323757be043bf90c006eac.1703894626.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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.36 X-Spam-Score: -6.36 X-Migadu-Queue-Id: BB98320694 X-Migadu-Scanner: mx12.migadu.com X-TUID: 6WqQnaQdRFL/ * gnu/packages/rust-apps.scm (bat): Update to 0.24.0. [arguments]: Add 'install-extras step for completions and manpage. Change-Id: Ibcd82fbd297fb84ab265486694126aed77862dd8 --- gnu/packages/rust-apps.scm | 85 ++++++++++++++++++++++++++------------ 1 file changed, 59 insertions(+), 26 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index df731d4b61..200c8a39ef 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -78,6 +78,7 @@ (define-module (gnu packages rust-apps) #:use-module (gnu packages kde) #:use-module (gnu packages linux) #:use-module (gnu packages networking) + #:use-module (gnu packages shells) #:use-module (gnu packages ssh) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) @@ -213,59 +214,91 @@ (define-public alfis (define-public bat (package (name "bat") - (version "0.20.0") + (version "0.24.0") (source (origin (method url-fetch) (uri (crate-uri "bat" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05sj0chxpai26fhk1k7p5m54v3j7n1x64ayx53mcimsj1skdr77m")))) + (base32 "11nc2iv2qhd1bs16yijqq934864ybnmg485rny70scy26xb9xk4x")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-ansi-colours" ,rust-ansi-colours-1) - ("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-atty" ,rust-atty-0.2) + (list + #:install-source? #f + #:cargo-inputs + `(("rust-ansi-colours" ,rust-ansi-colours-1) ("rust-bincode" ,rust-bincode-1) - ("rust-bugreport" ,rust-bugreport-0.4) + ("rust-bugreport" ,rust-bugreport-0.5) ("rust-bytesize" ,rust-bytesize-1) - ("rust-clap" ,rust-clap-2) - ("rust-clap" ,rust-clap-2) - ("rust-clircle" ,rust-clircle-0.3) + ("rust-clap" ,rust-clap-4) + ("rust-clircle" ,rust-clircle-0.4) ("rust-console" ,rust-console-0.15) ("rust-content-inspector" ,rust-content-inspector-0.2) - ("rust-dirs-next" ,rust-dirs-next-2) - ("rust-encoding" ,rust-encoding-0.2) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-etcetera" ,rust-etcetera-0.8) ("rust-flate2" ,rust-flate2-1) - ("rust-git2" ,rust-git2-0.13) + ("rust-git2" ,rust-git2-0.18) ("rust-globset" ,rust-globset-0.4) ("rust-grep-cli" ,rust-grep-cli-0.1) + ("rust-home" ,rust-home-0.5) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.49) ("rust-once-cell" ,rust-once-cell-1) + ("rust-os-str-bytes" ,rust-os-str-bytes-6.4) ("rust-path-abs" ,rust-path-abs-0.5) + ("rust-plist" ,rust-plist-1) ("rust-regex" ,rust-regex-1) + ("rust-run-script" ,rust-run-script-0.10) ("rust-semver" ,rust-semver-1) ("rust-serde" ,rust-serde-1) - ("rust-serde-yaml" ,rust-serde-yaml-0.8) + ("rust-serde-yaml" ,rust-serde-yaml-0.9) ("rust-shell-words" ,rust-shell-words-1) - ("rust-syntect" ,rust-syntect-4) + ("rust-syntect" ,rust-syntect-5) ("rust-thiserror" ,rust-thiserror-1) ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-walkdir" ,rust-walkdir-2) ("rust-wild" ,rust-wild-2)) - #:cargo-development-inputs - (("rust-assert-cmd" ,rust-assert-cmd-2) - ("rust-nix" ,rust-nix-0.23) - ("rust-predicates" ,rust-predicates-2) - ("rust-serial-test" ,rust-serial-test-0.5) + #:cargo-development-inputs + `(("rust-assert-cmd" ,rust-assert-cmd-2) + ("rust-expect-test" ,rust-expect-test-1) + ("rust-nix" ,rust-nix-0.26) + ("rust-predicates" ,rust-predicates-3) + ("rust-serial-test" ,rust-serial-test-2) ("rust-tempfile" ,rust-tempfile-3) - ("rust-wait-timeout" ,rust-wait-timeout-0.2)))) - (native-inputs - (list pkg-config)) - (inputs - (list libgit2 zlib)) + ("rust-wait-timeout" ,rust-wait-timeout-0.2)) + #: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"))) + (mkdir-p bash-completions-dir) + (mkdir-p zsh-completions-dir) + (mkdir-p fish-completions-dir) + (copy-file "assets/completions/bat.bash.in" + (string-append bash-completions-dir "/bat")) + (copy-file "assets/completions/bat.zsh.in" + (string-append zsh-completions-dir "/_bat")) + (copy-file "assets/completions/bat.fish.in" + (string-append fish-completions-dir + "/bat.fish")) + (rename-file "assets/manual/bat.1.in" "assets/manual/bat.1") + (install-file "assets/manual/bat.1" man1))))))) + (native-inputs (list pkg-config)) + (inputs (list libgit2-1.7 zlib)) (home-page "https://github.com/sharkdp/bat") - (synopsis "@command{cat} clone with syntax highlighting and git integration") + (synopsis + "@command{cat} clone with syntax highlighting and git integration") (description "@command{bat} is a drop-in @command{cat} replacement featuring syntax highlighting for a large number of languages, git integration, and automatic -- 2.41.0