GNU bug report logs - #69702
[PATCH 7/7] gnu: Add difft.

Previous Next

Package: guix-patches;

Reported by: muradm <mail <at> muradm.net>

Date: Sun, 10 Mar 2024 07:32:07 UTC

Severity: normal

Tags: patch

Done: muradm <mail <at> muradm.net>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 69702 in the body.
You can then email your comments to 69702 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to efraim <at> flashner.co.il, guix-patches <at> gnu.org:
bug#69702; Package guix-patches. (Sun, 10 Mar 2024 07:32:07 GMT) Full text and rfc822 format available.

Acknowledgement sent to muradm <mail <at> muradm.net>:
New bug report received and forwarded. Copy sent to efraim <at> flashner.co.il, guix-patches <at> gnu.org. (Sun, 10 Mar 2024 07:32:07 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: muradm <mail <at> muradm.net>
To: guix-patches <at> gnu.org
Subject: [PATCH 7/7] gnu: Add difft.
Date: Sun, 10 Mar 2024 10:31:00 +0300
* 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 <herman <at> rimm.ee>
 ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2024 Suhail Singh <suhail <at> bayesians.ca>
+;;; Copyright © 2024 muradm <mail <at> muradm.net>
 ;;;
 ;;; 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





Information forwarded to guix-patches <at> gnu.org:
bug#69702; Package guix-patches. (Sun, 10 Mar 2024 07:58:02 GMT) Full text and rfc822 format available.

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: muradm <mail <at> muradm.net>
To: control <at> debbugs.gnu.org
Cc: 69702 <at> debbugs.gnu.org, Efraim Flashner <efraim <at> flashner.co.il>,
 guix-patches <at> gnu.org
Subject: Re: [bug#69702] [PATCH 7/7] gnu: Add difft.
Date: Sun, 10 Mar 2024 10:56:56 +0300
[Message part 1 (text/plain, inline)]
close 69702

muradm <mail <at> muradm.net> writes:

> * 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 <herman <at> rimm.ee>
>  ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
>  ;;; Copyright © 2024 Suhail Singh <suhail <at> bayesians.ca>
> +;;; Copyright © 2024 muradm <mail <at> muradm.net>
>  ;;;
>  ;;; 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")

[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#69702; Package guix-patches. (Sun, 10 Mar 2024 07:58:04 GMT) Full text and rfc822 format available.

bug closed, send any further explanations to 69702 <at> debbugs.gnu.org and muradm <mail <at> muradm.net> Request was from muradm <mail <at> muradm.net> to control <at> debbugs.gnu.org. (Sun, 10 Mar 2024 07:58:05 GMT) Full text and rfc822 format available.

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sun, 07 Apr 2024 11:24:13 GMT) Full text and rfc822 format available.

This bug report was last modified 1 year and 152 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.