From unknown Sun Sep 07 01:27:58 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69702] [PATCH 7/7] gnu: Add difft. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Sun, 10 Mar 2024 07:32:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69702 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69702@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by submit@debbugs.gnu.org id=B.17100559225702 (code B ref -1); Sun, 10 Mar 2024 07:32:07 +0000 Received: (at submit) by debbugs.gnu.org; 10 Mar 2024 07:32:02 +0000 Received: from localhost ([127.0.0.1]:35372 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjDf7-0001Tl-Do for submit@debbugs.gnu.org; Sun, 10 Mar 2024 03:32:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:54758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjDev-0001Sc-7T for submit@debbugs.gnu.org; Sun, 10 Mar 2024 03:31:50 -0400 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 1rjDeN-0004xS-2c for guix-patches@gnu.org; Sun, 10 Mar 2024 03:31:15 -0400 Received: from nomad-cl1.muradm.net ([139.162.159.157]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rjDeK-0006Jg-F9 for guix-patches@gnu.org; Sun, 10 Mar 2024 03:31:14 -0400 Received: from localhost ([127.0.0.1]:42782) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.1) (envelope-from ) id 1rjDdt-0008LQ-38 for guix-patches@gnu.org; Sun, 10 Mar 2024 07:30:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=e0w6Jb/DByHubd4p5Cg3f1216pOE63f0kp74raQWGK8=; b=EJLiobZrWiMnfKfePESFlF1rmi 2VCXhoTqsY382MCk5DYMpC/jtL1thVGm1ZL2wpeMNN2GlbiG9Ct84TuZ06JyShdpD4uP/cDJ4USwm Mg5ekgf0ewZqmORd/sLStpO/MjCAEEqkWTkC6Ppzm78HfDkT0MElnR8Z99/pct1jg3LJzgIo9tAGa zPs07HkVzewyyEB0vJz6TA+tsfbqAnoVXnFiCJ5q3/aSAFitX5BnUu67SlJ57vjot/4ytv5PV8oLo ZiBxPsSZeG0S8VF8mb9ElBUgqf1JwLFBtI0kf8IKvAAIbX3uleZL96hTKwRLp7o5qA2YUp1ysQ7Mn APjUDP39yyc+toCakfdymbnfkLGqESiGFmAe1GKUjLR2VdCmjWy2qIJKr2boo0zrWA0Xxlc2hDMFK ogFgNEt9JIMBo/4cUHyfWngVNv/JQT0bc/OeC8pHU4aByTrxW+QRUOqzNdL4MJQruMy9OjPZK02s6 HpOMG5b/l7r9kfeYopF1H3of; Received: from muradm by localhost with local (Exim 4.96.1) (envelope-from ) id 1rjDeI-0008Rs-0f for guix-patches@gnu.org; Sun, 10 Mar 2024 10:31:10 +0300 From: muradm Date: Sun, 10 Mar 2024 10:31:00 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=139.162.159.157; envelope-from=mail@muradm.net; helo=nomad-cl1.muradm.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * gnu/packages/rust-apps.scm (difft): New variable. Change-Id: I9f252fac8f0e191a57c18a87d4348107df9481d8 --- gnu/packages/rust-apps.scm | 70 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 7313cdef77..fbd2dd935e 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2024 Herman Rimm ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> ;;; Copyright © 2024 Suhail Singh +;;; Copyright © 2024 muradm ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,6 +62,7 @@ (define-module (gnu packages rust-apps) #:use-module (gnu packages admin) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages c) #:use-module (gnu packages compression) #:use-module (gnu packages crates-apple) #:use-module (gnu packages crates-crypto) @@ -424,6 +426,74 @@ (define-public diffr highlighting tool to ease code review from your terminal.") (license license:expat))) +(define-public difft + (package + (name "difft") + (version "0.56.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "difftastic" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zr2zq5a58nni6113vd5nvinrw8y4p9y697mh8hs91mj3w3n4nd2")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Cargo.toml" + (("< 1.10") "<= 1.10") ;; regex + (("2.0.2") "2.0.1") ;; typed-arena + (("2.0.5") "2.0.12") ;; assert_cmd + (("0.4.19") "0.5") ;; ignore + (("0.1.24") "0.1.35") ;; libmimalloc-sys + (("0.1.28") "0.1.39") ;; mimalloc + (("2.1.1") "2.1.5")))))) ;; predicates + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bumpalo" ,rust-bumpalo-3) + ("rust-cc" ,rust-cc-1) + ("rust-clap" ,rust-clap-3) + ("rust-const-format" ,rust-const-format-0.2) + ("rust-crossterm" ,rust-crossterm-0.27) + ("rust-glob" ,rust-glob-0.3) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-humansize" ,rust-humansize-2) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-itertools" ,rust-itertools-0.11) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-libmimalloc-sys" ,rust-libmimalloc-sys-0.1) + ("rust-line-numbers" ,rust-line-numbers-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-mimalloc" ,rust-mimalloc-0.1) + ("rust-owo-colors" ,rust-owo-colors-3) + ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.5) + ("rust-radix-heap" ,rust-radix-heap-0.4) + ("rust-rayon" ,rust-rayon-1) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-rustc-hash" ,rust-rustc-hash-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-strsim" ,rust-strsim-0.10) + ("rust-strum" ,rust-strum-0.25) + ("rust-tree-sitter" ,rust-tree-sitter-0.20) + ("rust-tree-magic-mini" ,rust-tree-magic-mini-3) + ("rust-typed-arena" ,rust-typed-arena-2) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-version-check" ,rust-version-check-0.9) + ("rust-wu-diff" ,rust-wu-diff-0.1)) + #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-2) + ("rust-predicates" ,rust-predicates-2) + ("rust-pretty-assertions" ,rust-pretty-assertions-1)))) + (inputs + (list mimalloc)) + (home-page "http://difftastic.wilfred.me.uk/") + (synopsis "A structural diff that understands syntax.") + (description + "This package provides a structural diff that understands syntax.") + (license license:expat))) + (define-public drill (package (name "drill") -- 2.41.0 From unknown Sun Sep 07 01:27:58 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69702] [PATCH 7/7] gnu: Add difft. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Mar 2024 07:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69702 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: control@debbugs.gnu.org Cc: 69702@debbugs.gnu.org, efraim@flashner.co.il X-Debbugs-Original-Cc: 69702@debbugs.gnu.org, Efraim Flashner , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17100574748915 (code B ref -1); Sun, 10 Mar 2024 07:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Mar 2024 07:57:54 +0000 Received: from localhost ([127.0.0.1]:35501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjE49-0002Jj-R8 for submit@debbugs.gnu.org; Sun, 10 Mar 2024 03:57:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:50396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjE47-0002Ja-Kl for submit@debbugs.gnu.org; Sun, 10 Mar 2024 03:57:52 -0400 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 1rjE3a-000529-7E for guix-patches@gnu.org; Sun, 10 Mar 2024 03:57:18 -0400 Received: from nomad-cl1.muradm.net ([139.162.159.157]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rjE3Y-0002zR-LA for guix-patches@gnu.org; Sun, 10 Mar 2024 03:57:17 -0400 Received: from localhost ([127.0.0.1]:41038) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.1) (envelope-from ) id 1rjE38-0008O6-1N; Sun, 10 Mar 2024 07:56:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Type:MIME-Version:Message-ID:In-reply-to:Date:Subject:Cc:To :From:References:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=+ux+vgwxEolCK2/QSrWGdIYqa2dRIxLfRl9LpTDgpK8=; b=clUKjYAHtQ1buo2RPX4bZgffkN Et5ns78mBfRDljY0PT+wHOCXEd54FbRARrOWBXf7xlEzytjuvsVL03uOs3e2XMkQgVotsqD2Q+RE/ s9oaBKvpQi+/ujr3a2632qDXJUmbsckFp+XHtyr6Y81gJD5TE51sChxp/1LdJ3vwovStXFaHn4yEB Czx6oNzpHPs1DkdNNylxALRNKVAbzbB1jE7VRcge5/O8XC4K/ckCHcjcBEImQkzh7mWmqUXXYcDZX DtBuRhJGQe4YfxH063sVcbGFn1Xt1nQJSv/aZA0cG4/2UnwGwtJxyQyHeasqceft5CbnNMEFNcNze YqBq9YDx+xi4UuruZG3Tj041SAeQ7RRlYs17cr5OH63HC0zp/nQbUxQeVw3RZFZ3XR9twQ7aGVg8C hSCgYwSZmoSaM8uLsOiHdCJfZf8OrqF5FOi8x/CQ1Z/3bfWtEsH1pBz22u5kr5gJLZ+QJFOog2AmL Ur6p/G7c7DRs3ySAqhEjP/1A; Received: from muradm by localhost with local (Exim 4.96.1) (envelope-from ) id 1rjE3W-0000bl-2P; Sun, 10 Mar 2024 10:57:14 +0300 References: User-agent: mu4e 1.10.8; emacs 30.0.50 From: muradm Date: Sun, 10 Mar 2024 10:56:56 +0300 In-reply-to: Message-ID: <87h6he1put.fsf@muradm.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=139.162.159.157; envelope-from=mail@muradm.net; helo=nomad-cl1.muradm.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable close 69702 muradm writes: > * gnu/packages/rust-apps.scm (difft): New variable. > > Change-Id: I9f252fac8f0e191a57c18a87d4348107df9481d8 > --- > gnu/packages/rust-apps.scm | 70=20 > ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 70 insertions(+) > > diff --git a/gnu/packages/rust-apps.scm=20 > b/gnu/packages/rust-apps.scm > index 7313cdef77..fbd2dd935e 100644 > --- a/gnu/packages/rust-apps.scm > +++ b/gnu/packages/rust-apps.scm > @@ -31,6 +31,7 @@ > ;;; Copyright =C2=A9 2024 Herman Rimm > ;;; Copyright =C2=A9 2024 Tomas Volf <~@wolfsden.cz> > ;;; Copyright =C2=A9 2024 Suhail Singh > +;;; Copyright =C2=A9 2024 muradm > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -61,6 +62,7 @@ (define-module (gnu packages rust-apps) > #:use-module (gnu packages admin) > #:use-module (gnu packages base) > #:use-module (gnu packages bash) > + #:use-module (gnu packages c) > #:use-module (gnu packages compression) > #:use-module (gnu packages crates-apple) > #:use-module (gnu packages crates-crypto) > @@ -424,6 +426,74 @@ (define-public diffr > highlighting tool to ease code review from your terminal.") > (license license:expat))) > > +(define-public difft > + (package > + (name "difft") > + (version "0.56.1") > + (source > + (origin > + (method url-fetch) > + (uri (crate-uri "difftastic" version)) > + (file-name (string-append name "-" version ".tar.gz")) > + (sha256 > + (base32=20 > "1zr2zq5a58nni6113vd5nvinrw8y4p9y697mh8hs91mj3w3n4nd2")) > + (modules '((guix build utils))) > + (snippet > + '(begin > + (substitute* "Cargo.toml" > + (("< 1.10") "<=3D 1.10") ;; regex > + (("2.0.2") "2.0.1") ;; typed-arena > + (("2.0.5") "2.0.12") ;; assert_cmd > + (("0.4.19") "0.5") ;; ignore > + (("0.1.24") "0.1.35") ;; libmimalloc-sys > + (("0.1.28") "0.1.39") ;; mimalloc > + (("2.1.1") "2.1.5")))))) ;; predicates > + (build-system cargo-build-system) > + (arguments > + `(#:cargo-inputs (("rust-bumpalo" ,rust-bumpalo-3) > + ("rust-cc" ,rust-cc-1) > + ("rust-clap" ,rust-clap-3) > + ("rust-const-format"=20 > ,rust-const-format-0.2) > + ("rust-crossterm" ,rust-crossterm-0.27) > + ("rust-glob" ,rust-glob-0.3) > + ("rust-hashbrown" ,rust-hashbrown-0.14) > + ("rust-humansize" ,rust-humansize-2) > + ("rust-ignore" ,rust-ignore-0.4) > + ("rust-itertools" ,rust-itertools-0.11) > + ("rust-lazy-static" ,rust-lazy-static-1) > + ("rust-libc" ,rust-libc-0.2) > + ("rust-libmimalloc-sys"=20 > ,rust-libmimalloc-sys-0.1) > + ("rust-line-numbers"=20 > ,rust-line-numbers-0.3) > + ("rust-log" ,rust-log-0.4) > + ("rust-mimalloc" ,rust-mimalloc-0.1) > + ("rust-owo-colors" ,rust-owo-colors-3) > + ("rust-pretty-env-logger"=20 > ,rust-pretty-env-logger-0.5) > + ("rust-radix-heap" ,rust-radix-heap-0.4) > + ("rust-rayon" ,rust-rayon-1) > + ("rust-rayon" ,rust-rayon-1) > + ("rust-regex" ,rust-regex-1) > + ("rust-rustc-hash" ,rust-rustc-hash-1) > + ("rust-serde" ,rust-serde-1) > + ("rust-serde-json" ,rust-serde-json-1) > + ("rust-strsim" ,rust-strsim-0.10) > + ("rust-strum" ,rust-strum-0.25) > + ("rust-tree-sitter"=20 > ,rust-tree-sitter-0.20) > + ("rust-tree-magic-mini"=20 > ,rust-tree-magic-mini-3) > + ("rust-typed-arena" ,rust-typed-arena-2) > + ("rust-unicode-width"=20 > ,rust-unicode-width-0.1) > + ("rust-version-check"=20 > ,rust-version-check-0.9) > + ("rust-wu-diff" ,rust-wu-diff-0.1)) > + #:cargo-development-inputs (("rust-assert-cmd"=20 > ,rust-assert-cmd-2) > + ("rust-predicates"=20 > ,rust-predicates-2) > + ("rust-pretty-assertions"=20 > ,rust-pretty-assertions-1)))) > + (inputs > + (list mimalloc)) > + (home-page "http://difftastic.wilfred.me.uk/") > + (synopsis "A structural diff that understands syntax.") > + (description > + "This package provides a structural diff that understands=20 > syntax.") > + (license license:expat))) > + > (define-public drill > (package > (name "drill") --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEESPY5lma9A9l5HGLP6M7O0mLOBeIFAmXtZ9oACgkQ6M7O0mLO BeIdYBAAto28qkAlzFw4+M1jgPl0F8Iind5LWtaTpD6AXhR4RD1+OTci1TM+8MCx XMSVW3qgTZvXTycT6542eqGvvPC9Jn6DEme4nZ9Hv6X9KSPRPUXWZB3dDrfxPCjA uKl51oJ2FHpoCKGiwCVLobNkH7tGgoshXJfoVhd/CrAWLkEfjKrEkrgD+aRL60ok iHn2lMwplBFSvUtSCJxMrMczv65H1Hy8t0Q9Fh0AI+vbskV7V8lgTpGx0llajFf3 4PAfCBjvRnuXzpZyu/UQzyQYMFgUBU/hbBUZfhHS5CA3c1DSGGqw8l+PCZeGNwK5 v1NED7LJWSCfxjJRVlDWXEvj4FfUlGM7MZWJtSmmBEYmScFmDNWgCjTUsBkTldYc oXYtIJnR0vivA5oReDHW3FtlGGo3qHG3dhFcq7srRhdVxTIX76FVBHy6BE7qJSEW 7zzAq6uE4eLW5hNmUhdfS9/lr6PyqnITI+0syAVR51nP5/CYAyoHAquLg/B5L2Zw RnJVPXspoa2miLQzrGeOqZy8CyfD9dUzRbjrysFEzUo6iBFXnhqvyzEhHA0rIGD+ 4tnXjZS1StrmvJeOXcFlnOZScmC5VFKrwJwleWo73aEYC2c7Hka6uI3ypQSxgfCL Gdu1ungMaB0GOPdTupyJg4SmNFZt0ApxkbR5IgTwZhK687X5MiA= =IKIJ -----END PGP SIGNATURE----- --=-=-=--