[bug#52306] [PATCH 1/6] gnu: Add git-interactive-rebase-tool

[bug#52306] [PATCH 1/6] gnu: Add git-interactive-rebase-tool

[jgart via Guix-patches via]

Hi Guixers,

Here is git-interactive-rebase-tool. This tool is amazing! I use it everyday
to clean up my history. D. Richard Hipp shrugs.

https://gitrebasetool.mitmaro.ca/

[bug#52306] [PATCH 1/6] gnu: rust-proc-macro2-1: Update to 1.0.32.

[jgart via Guix-patches via]

This is the first version. I realize there might be some clean up I still need
to do. Any early feedback is most appreciated.

* gnu/packages/crates-io.scm (rust-proc-macro2-1): Update to 1.0.32.
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8d1a52c738..a425264935 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38632,7 +38632,7 @@ (define-public rust-proc-macro-nested-0.1
 (define-public rust-proc-macro2-1
   (package
     (name "rust-proc-macro2")
-    (version "1.0.27")
+    (version "1.0.32")
     (source
       (origin
         (method url-fetch)
@@ -38640,7 +38640,7 @@ (define-public rust-proc-macro2-1
         (file-name (string-append name "-" version ".crate"))
         (sha256
          (base32
-          "0f3h0zl5w5090ajmmvpmhkpr4iwqnn5rip3afacabhc657vwmn7h"))))
+          "0hqbxlvhiaybakl1gai3mgps1dxsmxricxsr2rfdrh222z0qql5s"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags '("--lib")
-- 
2.34.0

[bug#52306] [PATCH 2/6] gnu: Add rust-rstest-0.6.

[jgart via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rstest-0.6): New variable.
---
 gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a425264935..59b886f1ce 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42822,6 +42822,33 @@ (define-public rust-rstar-0.8
          (base32
           "1b6vjfwvpcgy0q8ywywz548vhxrmhbz2sm6xyhnmj5p5xd1xfqff"))))))
 
+(define-public rust-rstest-0.6
+  (package
+    (name "rust-rstest")
+    (version "0.6.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rstest" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "1wdd0ci0bn6fd5v5c19lhlqrpadk18fl4jzvh75b26616anlxdil"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-cfg-if" ,rust-cfg-if-1)
+         ("rust-proc-macro2" ,rust-proc-macro2-1)
+         ("rust-quote" ,rust-quote-1)
+         ("rust-rustc-version" ,rust-rustc-version-0.3)
+         ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/la10736/rstest")
+    (synopsis "Rust fixture based test framework")
+    (description
+      "rstest uses procedural macros to help you on writing fixtures and
+table-based tests.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-rstest-0.10
   (package
     (name "rust-rstest")
-- 
2.34.0

[bug#52306] [PATCH 2/6] gnu: Add rust-rstest-0.6.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 2071 bytes --]

This package should inherit from a previous rust-rstest package, and
have some of the fields deduplicated.

On Sun, Dec 05, 2021 at 04:36:08PM -0500, jgart via Guix-patches via wrote:
> * gnu/packages/crates-io.scm (rust-rstest-0.6): New variable.
> ---
>  gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
> 
> diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
> index a425264935..59b886f1ce 100644
> --- a/gnu/packages/crates-io.scm
> +++ b/gnu/packages/crates-io.scm
> @@ -42822,6 +42822,33 @@ (define-public rust-rstar-0.8
>           (base32
>            "1b6vjfwvpcgy0q8ywywz548vhxrmhbz2sm6xyhnmj5p5xd1xfqff"))))))
>  
> +(define-public rust-rstest-0.6
> +  (package
> +    (name "rust-rstest")
> +    (version "0.6.5")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (crate-uri "rstest" version))
> +        (file-name (string-append name "-" version ".tar.gz"))
> +        (sha256
> +          (base32 "1wdd0ci0bn6fd5v5c19lhlqrpadk18fl4jzvh75b26616anlxdil"))))
> +    (build-system cargo-build-system)
> +    (arguments
> +      `(#:skip-build? #t
> +        #:cargo-inputs
> +        (("rust-cfg-if" ,rust-cfg-if-1)
> +         ("rust-proc-macro2" ,rust-proc-macro2-1)
> +         ("rust-quote" ,rust-quote-1)
> +         ("rust-rustc-version" ,rust-rustc-version-0.3)
> +         ("rust-syn" ,rust-syn-1))))
> +    (home-page "https://github.com/la10736/rstest")
> +    (synopsis "Rust fixture based test framework")
> +    (description
> +      "rstest uses procedural macros to help you on writing fixtures and
> +table-based tests.")
> +    (license (list license:expat license:asl2.0))))
> +
>  (define-public rust-rstest-0.10
>    (package
>      (name "rust-rstest")
> -- 
> 2.34.0
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#52306] [PATCH 3/6] gnu: rust-syn-1: Update to 1.0.82.

[jgart via Guix-patches via]

* gnu/packages/music.scm (rust-syn-1): Update to 1.0.82.
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 59b886f1ce..2d629bb59e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -51897,14 +51897,14 @@ (define-public rust-syn-test-suite-0
 (define-public rust-syn-1
   (package
     (name "rust-syn")
-    (version "1.0.72")
+    (version "1.0.82")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "syn" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "10mb1cqmq2vpl5v6qjgqqyvhgs9yf9xv9f0dbskababrzfzcvs51"))))
+        (base32 "0ncx7gg5mvd16q5xf77hgk09nwmfq0ppsn0vgc9x9jv0pg85vbwd"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.34.0

[bug#52306] [PATCH 4/6] gnu: Add rust-xi-unicode-0.3.

[jgart via Guix-patches via]

* gnu/packages/crates-io.scm (rust-xi-unicode-0.3): New variable.
---
 gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2d629bb59e..41bc459939 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63277,6 +63277,26 @@ (define-public svd2rust
       "Generate Rust register maps (`struct`s) from SVD files")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-xi-unicode-0.3
+  (package
+    (name "rust-xi-unicode")
+    (version "0.3.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "xi-unicode" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "12mvjgrhr7557cib69wm4q5s4srba27pg2df9l1zihrxgnbh0wx6"))))
+    (build-system cargo-build-system)
+    (arguments `(#:skip-build? #t))
+    (home-page "https://github.com/google/xi-editor")
+    (synopsis
+      "Unicode utilities useful for text editing, including a line breaking iterator.")
+    (description
+      "Unicode utilities useful for text editing, including a line breaking iterator.")
+    (license license:asl2.0)))
+
 (define-public rust-shell2batch-0.4
   (package
     (name "rust-shell2batch")
-- 
2.34.0

[bug#52306] [PATCH 4/6] gnu: Add rust-xi-unicode-0.3.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1911 bytes --]

Can you sort this package alphabetically? Also the synopsis needs some
tweaking, it shouldn't be the same as the description and shouldn't end
in a period.

On Sun, Dec 05, 2021 at 04:36:10PM -0500, jgart via Guix-patches via wrote:
> * gnu/packages/crates-io.scm (rust-xi-unicode-0.3): New variable.
> ---
>  gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
> index 2d629bb59e..41bc459939 100644
> --- a/gnu/packages/crates-io.scm
> +++ b/gnu/packages/crates-io.scm
> @@ -63277,6 +63277,26 @@ (define-public svd2rust
>        "Generate Rust register maps (`struct`s) from SVD files")
>      (license (list license:expat license:asl2.0))))
>  
> +(define-public rust-xi-unicode-0.3
> +  (package
> +    (name "rust-xi-unicode")
> +    (version "0.3.0")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (crate-uri "xi-unicode" version))
> +        (file-name (string-append name "-" version ".tar.gz"))
> +        (sha256
> +          (base32 "12mvjgrhr7557cib69wm4q5s4srba27pg2df9l1zihrxgnbh0wx6"))))
> +    (build-system cargo-build-system)
> +    (arguments `(#:skip-build? #t))
> +    (home-page "https://github.com/google/xi-editor")
> +    (synopsis
> +      "Unicode utilities useful for text editing, including a line breaking iterator.")
> +    (description
> +      "Unicode utilities useful for text editing, including a line breaking iterator.")
> +    (license license:asl2.0)))
> +
>  (define-public rust-shell2batch-0.4
>    (package
>      (name "rust-shell2batch")
> -- 
> 2.34.0
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#52306] [PATCH 5/6] gnu: Add rust-concat-idents-1.

[jgart via Guix-patches via]

* gnu/packages/crates-io.scm (rust-concat-idents-1): New variable.
---
 gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 41bc459939..a05cbc40ad 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63297,6 +63297,30 @@ (define-public rust-xi-unicode-0.3
       "Unicode utilities useful for text editing, including a line breaking iterator.")
     (license license:asl2.0)))
 
+(define-public rust-concat-idents-1
+  (package
+    (name "rust-concat-idents")
+    (version "1.1.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "concat-idents" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32 "0bqdl6vml2ksyz6hc4xlpw3iqaagxs7xn0xinwa51ms80a390vsb"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build?
+        #t
+        #:cargo-inputs
+        (("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1))))
+    (home-page "https://github.com/DzenanJupic/concat-idents")
+    (synopsis
+      "Allows concatenating multiple identifiers and using them everywhere")
+    (description
+      "Allows concatenating multiple identifiers and using them everywhere")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-shell2batch-0.4
   (package
     (name "rust-shell2batch")
-- 
2.34.0

[bug#52306] [PATCH 5/6] gnu: Add rust-concat-idents-1.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1998 bytes --]

This package also should be sorted alphabetically and have the
synopsis/description tweaked.

On Sun, Dec 05, 2021 at 04:36:11PM -0500, jgart via Guix-patches via wrote:
> * gnu/packages/crates-io.scm (rust-concat-idents-1): New variable.
> ---
>  gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
> 
> diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
> index 41bc459939..a05cbc40ad 100644
> --- a/gnu/packages/crates-io.scm
> +++ b/gnu/packages/crates-io.scm
> @@ -63297,6 +63297,30 @@ (define-public rust-xi-unicode-0.3
>        "Unicode utilities useful for text editing, including a line breaking iterator.")
>      (license license:asl2.0)))
>  
> +(define-public rust-concat-idents-1
> +  (package
> +    (name "rust-concat-idents")
> +    (version "1.1.3")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (crate-uri "concat-idents" version))
> +        (file-name (string-append name "-" version ".tar.gz"))
> +        (sha256
> +          (base32 "0bqdl6vml2ksyz6hc4xlpw3iqaagxs7xn0xinwa51ms80a390vsb"))))
> +    (build-system cargo-build-system)
> +    (arguments
> +      `(#:skip-build?
> +        #t
> +        #:cargo-inputs
> +        (("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1))))
> +    (home-page "https://github.com/DzenanJupic/concat-idents")
> +    (synopsis
> +      "Allows concatenating multiple identifiers and using them everywhere")
> +    (description
> +      "Allows concatenating multiple identifiers and using them everywhere")
> +    (license (list license:expat license:asl2.0))))
> +
>  (define-public rust-shell2batch-0.4
>    (package
>      (name "rust-shell2batch")
> -- 
> 2.34.0
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#52306] [PATCH 6/6] gnu: Add git-interactive-rebase-tool.

[jgart via Guix-patches via]

* gnu/packages/rust-apps.scm (git-interactive-rebase-tool): New variable.
---
 gnu/packages/rust-apps.scm | 46 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 8634356ccd..5ac777f1ae 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -577,6 +577,52 @@ (define-public ripgrep
 gitignore rules.")
     (license (list license:unlicense license:expat))))
 
+(define-public git-interactive-rebase-tool
+  (package
+    (name "git-interactive-rebase-tool")
+    (version "2.1.0")
+    (source
+     (origin
+       ;; crates.io does not provide the test data.
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mitmaro/git-interactive-rebase-tool")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "173spqqpyc00kvfmldjmjfqizh9b4spq4xw4bskd4dny8qcpz28d"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:rust ,rust-1.52
+        #:cargo-test-flags
+        ;; https://github.com/MitMaro/git-interactive-rebase-tool/issues/586
+       '("--release" "--" "--skip=tests::success")
+        #:cargo-inputs
+        (("rust-anyhow" ,rust-anyhow-1)
+         ("rust-chrono" ,rust-chrono-0.4)
+         ("rust-clap" ,rust-clap-2)
+         ("rust-crossterm" ,rust-crossterm-0.19)
+         ("rust-git2" ,rust-git2-0.13)
+         ("rust-num-format" ,rust-num-format-0.4)
+         ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+         ("rust-unicode-width" ,rust-unicode-width-0.1)
+         ("rust-xi-unicode" ,rust-xi-unicode-0.3))
+        #:cargo-development-inputs
+        (("rust-concat-idents" ,rust-concat-idents-1)
+         ("rust-lazy-static" ,rust-lazy-static-1)
+         ("rust-rstest" ,rust-rstest-0.6)
+         ("rust-serial-test" ,rust-serial-test-0.5)
+         ("rust-tempfile" ,rust-tempfile-3))))
+    (inputs
+     `(("zlib" ,zlib)))
+    (home-page "https://gitrebasetool.mitmaro.ca/")
+    (synopsis "Terminal based sequence editor for git interactive rebase")
+    (description
+"Native cross-platform full feature terminal-based sequence editor for
+git interactive rebase.")
+    (license license:gpl3+)))
+
 (define-public rust-cbindgen
   (package
     (name "rust-cbindgen")
-- 
2.34.0

[bug#52306] [PATCH 6/6] gnu: Add git-interactive-rebase-tool.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 3039 bytes --]

The description should use full sentences. (ex: This package provides a
native ...). Also, if it is cross-platform or not isn't really relevant
to Guix.

On Sun, Dec 05, 2021 at 04:36:12PM -0500, jgart via Guix-patches via wrote:
> * gnu/packages/rust-apps.scm (git-interactive-rebase-tool): New variable.
> ---
>  gnu/packages/rust-apps.scm | 46 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 46 insertions(+)
> 
> diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
> index 8634356ccd..5ac777f1ae 100644
> --- a/gnu/packages/rust-apps.scm
> +++ b/gnu/packages/rust-apps.scm
> @@ -577,6 +577,52 @@ (define-public ripgrep
>  gitignore rules.")
>      (license (list license:unlicense license:expat))))
>  
> +(define-public git-interactive-rebase-tool
> +  (package
> +    (name "git-interactive-rebase-tool")
> +    (version "2.1.0")
> +    (source
> +     (origin
> +       ;; crates.io does not provide the test data.
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://github.com/mitmaro/git-interactive-rebase-tool")
> +             (commit version)))
> +       (file-name (git-file-name name version))
> +       (sha256
> +        (base32
> +         "173spqqpyc00kvfmldjmjfqizh9b4spq4xw4bskd4dny8qcpz28d"))))
> +    (build-system cargo-build-system)
> +    (arguments
> +      `(#:rust ,rust-1.52
> +        #:cargo-test-flags
> +        ;; https://github.com/MitMaro/git-interactive-rebase-tool/issues/586
> +       '("--release" "--" "--skip=tests::success")
> +        #:cargo-inputs
> +        (("rust-anyhow" ,rust-anyhow-1)
> +         ("rust-chrono" ,rust-chrono-0.4)
> +         ("rust-clap" ,rust-clap-2)
> +         ("rust-crossterm" ,rust-crossterm-0.19)
> +         ("rust-git2" ,rust-git2-0.13)
> +         ("rust-num-format" ,rust-num-format-0.4)
> +         ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
> +         ("rust-unicode-width" ,rust-unicode-width-0.1)
> +         ("rust-xi-unicode" ,rust-xi-unicode-0.3))
> +        #:cargo-development-inputs
> +        (("rust-concat-idents" ,rust-concat-idents-1)
> +         ("rust-lazy-static" ,rust-lazy-static-1)
> +         ("rust-rstest" ,rust-rstest-0.6)
> +         ("rust-serial-test" ,rust-serial-test-0.5)
> +         ("rust-tempfile" ,rust-tempfile-3))))
> +    (inputs
> +     `(("zlib" ,zlib)))
> +    (home-page "https://gitrebasetool.mitmaro.ca/")
> +    (synopsis "Terminal based sequence editor for git interactive rebase")
> +    (description
> +"Native cross-platform full feature terminal-based sequence editor for
> +git interactive rebase.")
> +    (license license:gpl3+)))
> +
>  (define-public rust-cbindgen
>    (package
>      (name "rust-cbindgen")
> -- 
> 2.34.0
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#52306] [PATCH 1/6] gnu: Add git-interactive-rebase-tool

[Nicolas Goaziou]

Hello,

jgart via Guix-patches via <guix-patches@gnu.org> writes:

> Here is git-interactive-rebase-tool. This tool is amazing! I use it everyday
> to clean up my history. D. Richard Hipp shrugs.
>
> https://gitrebasetool.mitmaro.ca/

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou