From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 5iwrHwA8nGVtNQEAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 19:16:32 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id uMeeGAA8nGUfbwAA62LTzQ (envelope-from ) for ; Mon, 08 Jan 2024 19:16:32 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="bfxi/k9m"; 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1704737588; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to: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=KKz4vfFADlR4lRsWxwiRJAqDaNHD+8Zdlf30fjeV0zo=; b=UECoBdc71Dx9AUuxnyzM3irGBxTSVSQfqQ7NlGuLj2hJDO3HHEwTV7AWFlylKm5IRoV6cs IkPt5UeknxXMJuHnCmDtzziqKMhZfLF9A8XzsnsW3syZoT+Cijg/p1vb+fjLunxeisedGl KtyoW/eFISUvT+C0WYbWOjZmbAzN3QgglJo2r0rUTyb1erKjUzXASNEAPi22f2/86prxlI HtibvtLb+6cplZW93pSIpRwd15seoPeycMVRK4vo80+QEpPOgTWirvi/SnfBOCT3WhIFwo HGlcUPCRx/zQJyqF5lrTLHQp2BUOnx6qFu4QUoNYTxkoFJ0OkgXOwU/k7vVFug== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704737588; a=rsa-sha256; cv=none; b=sHEw9qTI1GTVHGImXychFyUtTK8rhFjWfLe3ckcJTEsnNwV/+uX2lPf2BJVG9odyiUAglH 6H362woGsW1PM+HWZCP1rFZsuRdL7n0MM2sQoJDWPvaRg/TYMTgcCXB+pETLUM8yz0vQQz KuNEOFRvdVG19DCohVzmHbIlkzL1JqSV4iutL3gok+p/9IuCRkptOC11xK8/7uiPUyS283 xMBnWtbfRDvmzfcEaQtVKrtV3cw+rCnWHUKfSpacBbOKQc7OoWv5efx/XUNAhT+6wLXEE/ g5C5euk4wZXYeXsno9RpGMXiN6V3lN5qH4q2eFoEBgJXnCcTBBIZDhjDeI1X4Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="bfxi/k9m"; 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=none 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 178A813CAB for ; Mon, 8 Jan 2024 19:13:07 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMu7U-0000rz-O2; Mon, 08 Jan 2024 13:13: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 1rMu7P-0000qu-RG for guix-patches@gnu.org; Mon, 08 Jan 2024 13:13: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 1rMu7M-0005DL-G3 for guix-patches@gnu.org; Mon, 08 Jan 2024 13:12:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMu7S-0002Nx-P0 for guix-patches@gnu.org; Mon, 08 Jan 2024 13:13:02 -0500 Subject: bug#68275: [PATCH 11/11] gnu: Add git-delta. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 18:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 68275 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jaeme Sifat Cc: 68275-done@debbugs.gnu.org Received: via spool by 68275-done@debbugs.gnu.org id=D68275.17047375589127 (code D ref 68275); Mon, 08 Jan 2024 18:13:02 +0000 Received: (at 68275-done) by debbugs.gnu.org; 8 Jan 2024 18:12:38 +0000 Received: from localhost ([127.0.0.1]:37533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMu73-0002N9-NJ for submit@debbugs.gnu.org; Mon, 08 Jan 2024 13:12:38 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:51416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMu6z-0002Mh-Tr for 68275-done@debbugs.gnu.org; Mon, 08 Jan 2024 13:12:35 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3368abe1093so1990114f8f.2 for <68275-done@debbugs.gnu.org>; Mon, 08 Jan 2024 10:12:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704737542; x=1705342342; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=KKz4vfFADlR4lRsWxwiRJAqDaNHD+8Zdlf30fjeV0zo=; b=bfxi/k9m3H71xvWkhZbiribJLrG9mcI/q1aA4CQiFXcjRhwh+auHA5/9ONk96Oe+I9 B7Mmtf5UTiTnujxJQnhgNZAWAiyt3+DK5zJEdw0Flsk1sDPhkbCqN/E6wRx6WY6Fu0f0 7ES+uyoQ1kaHGZ/5SYRDG9PUX0aTeQ3BSbVvA61XWR/nqaY4uVfpj4Y4nVADqpp6EwDh Mg4vJeQl/PKLjOsuyeEYjMIsVM/QKTD82pbpHhKfFChTU3X9ztkBNfXijCaNZzFS2N1Q So3bRSlYnXRZUZNR0VGMoD/+H2bc2SPT70u94JzitdzU9CaW8Yzzp6k8LQWzfjvE3qHb 0Mrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704737542; x=1705342342; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KKz4vfFADlR4lRsWxwiRJAqDaNHD+8Zdlf30fjeV0zo=; b=JRlm6FcGMknb4/LhbJ9F0cX9MO9Pdk2d0K8xtqK+8zNxordUCXro5/0OZda+CK/h5s p8zro2rnBKT2nB8bUw/JkULj472SOgpUCjUWnul9WIkPNLw5Qc4h3N2dSaMs7wrK6GDB eiK4mrA//fch/SSzm2mcqDJF5P793Hgas5LXNhryfSY8Frx/xuZrIF4F13gRsGdhtbUQ yoxHcfE0VaSrzgKuGFFYUYRENn7vgbGysrcyNRYAI0wAOyTu6yvPLWJpVebg3lhbNu5p P/afNSMytJWmLfZIgxbz4xcuHaQWJLw0z65GvXqrHxlnSxOUDIT1dyFEeMMtLiHndtNY 9SEA== X-Gm-Message-State: AOJu0YxDQFUKmuKeiawKpiSgqknbJC3aiMIttQianhMQ/+bdADICE/i8 S2Wh4cnSSKhfSYQEfnNxEVA= X-Google-Smtp-Source: AGHT+IEdA4utcAy19wioXVCsUOzdbxF5TETKZ/1yBQja/ckc7IMT5nbJKZpEd/eM1LcZd+rEZdjQWw== X-Received: by 2002:a5d:4049:0:b0:336:bf57:5e68 with SMTP id w9-20020a5d4049000000b00336bf575e68mr2072339wrp.4.1704737541498; Mon, 08 Jan 2024 10:12:21 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id p11-20020a056000018b00b003362d0eefd3sm279074wrx.20.2024.01.08.10.12.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jan 2024 10:12:20 -0800 (PST) Date: Mon, 8 Jan 2024 20:12:19 +0200 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , Jaeme Sifat , 68275-done@debbugs.gnu.org References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="nUOsbr2DNTPi3lSE" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 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: , 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.89 X-Spam-Score: -6.89 X-Migadu-Queue-Id: 178A813CAB X-Migadu-Scanner: mx11.migadu.com X-TUID: 2myFke+4cmR0 --nUOsbr2DNTPi3lSE Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Thanks! Patches pushed to the rust-team branch. On Fri, Jan 05, 2024 at 11:52:42PM -0500, Jaeme Sifat wrote: > * gnu/packages/rust-apps.scm (git-delta): New variable. >=20 > Change-Id: I2319ab35b01842cb66b88df13fa64f31de4f20e5 > --- > gnu/packages/rust-apps.scm | 87 +++++++++++++++++++++++++++++++++++++- > 1 file changed, 86 insertions(+), 1 deletion(-) >=20 > 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 =C2=A9 2022 Greg Hogan > ;;; Copyright =C2=A9 2023 Arnav Andrew Jose > ;;; Copyright =C2=A9 2023 Wilko Meyer > -;;; Copyright =C2=A9 2023 Jaeme Sifat > +;;; Copyright =C2=A9 2023, 2024 Jaeme Sifat > ;;; Copyright =C2=A9 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))) > =20 > +(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"))= )) I added a snippet to allow using versions newer than 2.2.2 for rust-bytelines and only kept the package for bytelines-2.5.0. > + (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")) These I moved onto one line since they weren't too long. > + (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 @comm= and{grep} and > +a stylized box presentation.") > + (license license:expat))) > + > (define-public rust-xremap > (package > (name "rust-xremap") > --=20 > 2.41.0 >=20 >=20 >=20 --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --nUOsbr2DNTPi3lSE Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmWcOwMACgkQQarn3Mo9 g1GvhQ//cNTinueSeOJqNuYDtVXAXS4M2RADMZU1P8L+dkW1iNcjGOq8F44BInHo pB0k3TcFTm4ol6AAX1BfGhA8smFP9kjaeWS5nRCwAOjy8lkkW3ZuKUGqYcTCG65f 6TpDDeMKvM2c+IVeJnTHP/HUfO/CIe6zsIqlIIBzRpjLhrI/oGhEI7Dc5UpAhGyJ XRB0TkY+GCaEtOvBoUnazF9PiW1DfaQ+lecH69MAQ7gFIGndVeFNy0Uf+5EdlyiA yrNCiIfzGwcuSSqwa2iTAewBtXfaPksC0IoOU3ilDQ30cCYJZx7eW+Z0Pp9GFglJ 8F8OkK1bUMd5tSdiPuTqTI0uao8MiA9lmiO40SifiENwwv3hV5CBBa9XeJtPuUyh Dc4RyJDT3UdJHorpfQhz2HuZ7PSCKe/HPoJmfhsYBcRWQPq+pSqoZR8cnHekxZPe AVcRQS9EE+vSLrgJgFxumXVfgg5RUwRuSmrJWH3SJdSurWhPhuaaV3+OF0xClpJb M2/anbSlb6pa0ODzs+C+j93/0wJ8CObF9TYJvK5u6Bj+WKbuREEOvPTQoUGw1zj/ sxrUD5mdSG5/cxdJCaZTtBFKZy+D3RNbS5dvUHJS2FIGzK6avytkheL1YIB+6kjO QvtZigk95aMi0N3gCopJZzHTYpG6eTCnDRG0L2d/lTvSCcDfeKI= =RhqD -----END PGP SIGNATURE----- --nUOsbr2DNTPi3lSE--