From patchwork Sat Jan 6 04:52:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jaeme Sifat X-Patchwork-Id: 58415 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 4A1C027BBE9; Sat, 6 Jan 2024 04:54:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5793327BBE2 for ; Sat, 6 Jan 2024 04:54:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLyhA-0003H2-H1; Fri, 05 Jan 2024 23:54:04 -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 1rLyh6-0003FR-Dc for guix-patches@gnu.org; Fri, 05 Jan 2024 23:54:02 -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 1rLyh6-0000WI-67 for guix-patches@gnu.org; Fri, 05 Jan 2024 23:54:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLyhA-00075t-S6; Fri, 05 Jan 2024 23:54:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68275] [PATCH 11/11] gnu: Add git-delta. Resent-From: Jaeme Sifat Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Sat, 06 Jan 2024 04:54:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68275 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68275@debbugs.gnu.org Cc: Jaeme Sifat , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 68275-submit@debbugs.gnu.org id=B68275.170451682127149 (code B ref 68275); Sat, 06 Jan 2024 04:54:04 +0000 Received: (at 68275) by debbugs.gnu.org; 6 Jan 2024 04:53:41 +0000 Received: from localhost ([127.0.0.1]:58340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLygm-00073o-Ow for submit@debbugs.gnu.org; Fri, 05 Jan 2024 23:53:41 -0500 Received: from mailtransmit04.runbox.com ([2a0c:5a00:149::25]:48764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLygj-00072S-1J for 68275@debbugs.gnu.org; Fri, 05 Jan 2024 23:53:37 -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 1rLygY-004kYF-Kv for 68275@debbugs.gnu.org; Sat, 06 Jan 2024 05:53:26 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=selector1; h=Content-Transfer-Encoding:Content-Type:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From; bh=r+ZaOkHk2W2vfaI4O5B9zKjEBOqLIlfKnyBvQN4zigQ=; b=UOHpFpA/yRAkwfQoPemJXcO+D+ NaNtuhL07YMndFIEwY9r2SJPClqizFyZI+jaSiXYVLpNo/ANk7EVJ8w1Qdz2JzvmUrnAW/O/y7dSY ovYtB1eao3fDITqpXXrc4gsGzdJmo/WxK6L99RLSGrqjCYSjjq2XmnWGE2PkdL2ygCxT5XPjOtR6l Sz+b9UGGGlJ4jUi1dk1SVMueXUqaHfdl8U96Zl+SWtC8KzPDuWz1Tv9d2aYK8TmRpIrvcL/IZ1VaA JvsBIUvtCNcHaZeKA03LnWU5BHPoHpoII30i4eelW+3ZpYvXmFvExSLMDHZYXbvx9SXUiORKNxbhx 02F+oO/Q==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1rLygY-0007t0-Bm for 68275@debbugs.gnu.org; Sat, 06 Jan 2024 05:53:26 +0100 Received: by submission02.runbox with esmtpsa [Authenticated ID (1176697)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rLygV-007pu9-9E; Sat, 06 Jan 2024 05:53:23 +0100 Date: Fri, 5 Jan 2024 23:52:42 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 X-Patchwork-Original-From: Jaeme Sifat via Guix-patches via From: Jaeme Sifat Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust-apps.scm (git-delta): New variable. Change-Id: I2319ab35b01842cb66b88df13fa64f31de4f20e5 --- gnu/packages/rust-apps.scm | 87 +++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 6a224762a8..70d7cbfbb8 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2022 Greg Hogan ;;; Copyright © 2023 Arnav Andrew Jose ;;; Copyright © 2023 Wilko Meyer -;;; Copyright © 2023 Jaeme Sifat +;;; Copyright © 2023, 2024 Jaeme Sifat ;;; Copyright © 2023 Steve George ;;; ;;; This file is part of GNU Guix. @@ -2532,6 +2532,91 @@ (define-public git-absorb It will then write @code{fixup!} commits for each of those changes.") (license license:bsd-3))) +(define-public git-delta + (package + (name "git-delta") + (version "0.16.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "git-delta" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1pvy5jcpj3xzf2b8k9d5xwwamwlv9pzsx6p2yq61am38igafg9qb")))) + (build-system cargo-build-system) + (arguments + (list + #:install-source? #f + #:cargo-inputs + `(("rust-ansi-colours" ,rust-ansi-colours-1) + ("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-atty" ,rust-atty-0.2) + ("rust-bat" ,rust-bat-0.22) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-box-drawing" ,rust-box-drawing-0.1) + ("rust-bytelines" ,rust-bytelines-2.2) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-humanize" ,rust-chrono-humanize-0.2) + ("rust-clap" ,rust-clap-4) + ("rust-console" ,rust-console-0.15) + ("rust-ctrlc" ,rust-ctrlc-3) + ("rust-dirs" ,rust-dirs-4) + ("rust-git2" ,rust-git2-0.16) + ("rust-grep-cli" ,rust-grep-cli-0.1) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-palette" ,rust-palette-0.6) + ("rust-pathdiff" ,rust-pathdiff-0.2) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-shell-words" ,rust-shell-words-1) + ("rust-smol-str" ,rust-smol-str-0.1) + ("rust-syntect" ,rust-syntect-5) + ("rust-sysinfo" ,rust-sysinfo-0.28) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-vte" ,rust-vte-0.11) + ("rust-xdg" ,rust-xdg-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"))) + (mkdir-p bash-completions-dir) + (mkdir-p zsh-completions-dir) + (mkdir-p fish-completions-dir) + (copy-file "etc/completion/completion.bash" + (string-append bash-completions-dir + "/delta")) + (copy-file "etc/completion/completion.zsh" + (string-append zsh-completions-dir + "/_delta")) + (copy-file "etc/completion/completion.fish" + (string-append fish-completions-dir + "/delta.fish")))))))) + (native-inputs (list git-minimal pkg-config)) + (inputs (list libgit2 openssl zlib)) + (home-page "https://github.com/dandavison/delta") + (synopsis "Syntax-highlighting pager for git") + (description + "This package provides a syntax-highlighting pager for @command{git}. It uses +@command{bat} for syntax highlighting and provides many features such as advanced +keybindings, word-level diff highlighting, syntax highlighting for @command{grep} and +a stylized box presentation.") + (license license:expat))) + (define-public rust-xremap (package (name "rust-xremap")