gnu: stgit-2: Update to 2.5.3.

* gnu/packages/version-control.scm (stgit-2): Update to 2.5.3.
[source]: Remove snippet.
[inputs]: Use ‘cargo-inputs’.
[arguments]: Remove #:cargo-inputs.
* gnu/packages/rust-crates.scm (lookup-cargo-inputs)[stgit-2]: New entry.

Change-Id: I1fb026dc5a36c77cb04b08ccc2f7cea9201497d8

2 files changed, 197 insertions, 30 deletions

diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm
index f6c8078079d..28c79663153 100644
--- a/gnu/packages/rust-crates.scm
+++ b/gnu/packages/rust-crates.scm
@@ -17004,6 +17004,199 @@
                                      rust-zvariant-5.4.0
                                      rust-zvariant-derive-5.4.0
                                      rust-zvariant-utils-3.2.0))
+                     (stgit-2 =>
+                              (list rust-adler2-2.0.0
+                                    rust-ahash-0.8.11
+                                    rust-allocator-api2-0.2.21
+                                    rust-anstream-0.6.18
+                                    rust-anstyle-1.0.10
+                                    rust-anstyle-parse-0.2.6
+                                    rust-anstyle-query-1.1.2
+                                    rust-anstyle-wincon-3.0.7
+                                    rust-anyhow-1.0.97
+                                    rust-arc-swap-1.7.1
+                                    rust-autocfg-1.4.0
+                                    rust-bitflags-2.9.0
+                                    rust-bstr-1.12.0
+                                    rust-bzip2-rs-0.1.2
+                                    rust-cc-1.2.19
+                                    rust-cfg-if-1.0.0
+                                    rust-cfg-aliases-0.2.1
+                                    rust-clap-4.5.35
+                                    rust-clap-builder-4.5.35
+                                    rust-clap-lex-0.7.4
+                                    rust-clru-0.6.2
+                                    rust-colorchoice-1.0.3
+                                    rust-crc32fast-1.4.2
+                                    rust-ctrlc-3.4.6
+                                    rust-curl-0.4.47
+                                    rust-curl-sys-0.4.80+curl-8.12.1
+                                    rust-displaydoc-0.2.5
+                                    rust-dunce-1.0.5
+                                    rust-encoding-rs-0.8.35
+                                    rust-equivalent-1.0.2
+                                    rust-errno-0.3.11
+                                    rust-faster-hex-0.9.0
+                                    rust-fastrand-2.3.0
+                                    rust-filetime-0.2.25
+                                    rust-flate2-1.1.1
+                                    rust-fnv-1.0.7
+                                    rust-form-urlencoded-1.2.1
+                                    rust-getrandom-0.3.2
+                                    rust-gix-0.70.0
+                                    rust-gix-actor-0.33.2
+                                    rust-gix-bitmap-0.2.14
+                                    rust-gix-chunk-0.4.11
+                                    rust-gix-command-0.4.1
+                                    rust-gix-commitgraph-0.26.0
+                                    rust-gix-config-0.43.0
+                                    rust-gix-config-value-0.14.12
+                                    rust-gix-date-0.9.4
+                                    rust-gix-diff-0.50.0
+                                    rust-gix-discover-0.38.0
+                                    rust-gix-features-0.40.0
+                                    rust-gix-fs-0.13.0
+                                    rust-gix-glob-0.18.0
+                                    rust-gix-hash-0.16.0
+                                    rust-gix-hashtable-0.7.0
+                                    rust-gix-index-0.38.0
+                                    rust-gix-lock-16.0.0
+                                    rust-gix-object-0.47.0
+                                    rust-gix-odb-0.67.0
+                                    rust-gix-pack-0.57.0
+                                    rust-gix-packetline-0.18.4
+                                    rust-gix-path-0.10.15
+                                    rust-gix-protocol-0.48.0
+                                    rust-gix-quote-0.4.15
+                                    rust-gix-ref-0.50.0
+                                    rust-gix-refspec-0.28.0
+                                    rust-gix-revision-0.32.0
+                                    rust-gix-revwalk-0.18.0
+                                    rust-gix-sec-0.10.12
+                                    rust-gix-shallow-0.2.0
+                                    rust-gix-tempfile-16.0.0
+                                    rust-gix-trace-0.1.12
+                                    rust-gix-transport-0.45.0
+                                    rust-gix-traverse-0.44.0
+                                    rust-gix-url-0.29.0
+                                    rust-gix-utils-0.1.14
+                                    rust-gix-validate-0.9.4
+                                    rust-hashbrown-0.14.5
+                                    rust-hashbrown-0.15.2
+                                    rust-hermit-abi-0.5.0
+                                    rust-home-0.5.11
+                                    rust-icu-collections-1.5.0
+                                    rust-icu-locid-1.5.0
+                                    rust-icu-locid-transform-1.5.0
+                                    rust-icu-locid-transform-data-1.5.1
+                                    rust-icu-normalizer-1.5.0
+                                    rust-icu-normalizer-data-1.5.1
+                                    rust-icu-properties-1.5.1
+                                    rust-icu-properties-data-1.5.1
+                                    rust-icu-provider-1.5.0
+                                    rust-icu-provider-macros-1.5.0
+                                    rust-idna-1.0.3
+                                    rust-idna-adapter-1.2.0
+                                    rust-indexmap-2.9.0
+                                    rust-is-terminal-0.4.16
+                                    rust-is-terminal-polyfill-1.70.1
+                                    rust-itoa-1.0.15
+                                    rust-jiff-0.2.6
+                                    rust-jiff-static-0.2.6
+                                    rust-jiff-tzdb-0.1.4
+                                    rust-jiff-tzdb-platform-0.1.3
+                                    rust-libc-0.2.171
+                                    rust-libredox-0.1.3
+                                    rust-libz-sys-1.1.22
+                                    rust-linux-raw-sys-0.4.15
+                                    rust-linux-raw-sys-0.9.4
+                                    rust-litemap-0.7.5
+                                    rust-lock-api-0.4.12
+                                    rust-log-0.4.27
+                                    rust-maybe-async-0.2.10
+                                    rust-memchr-2.7.4
+                                    rust-memmap2-0.9.5
+                                    rust-miniz-oxide-0.8.8
+                                    rust-nix-0.29.0
+                                    rust-once-cell-1.21.3
+                                    rust-openssl-probe-0.1.6
+                                    rust-openssl-sys-0.9.107
+                                    rust-parking-lot-0.12.3
+                                    rust-parking-lot-core-0.9.10
+                                    rust-percent-encoding-2.3.1
+                                    rust-pkg-config-0.3.32
+                                    rust-portable-atomic-1.11.0
+                                    rust-portable-atomic-util-0.2.4
+                                    rust-proc-macro2-1.0.94
+                                    rust-prodash-29.0.1
+                                    rust-quote-1.0.40
+                                    rust-r-efi-5.2.0
+                                    rust-redox-syscall-0.5.11
+                                    rust-regex-automata-0.4.9
+                                    rust-rustix-0.38.44
+                                    rust-rustix-1.0.5
+                                    rust-ryu-1.0.20
+                                    rust-same-file-1.0.6
+                                    rust-schannel-0.1.27
+                                    rust-scopeguard-1.2.0
+                                    rust-serde-1.0.219
+                                    rust-serde-derive-1.0.219
+                                    rust-serde-json-1.0.140
+                                    rust-sha1-smol-1.0.1
+                                    rust-shell-words-1.1.0
+                                    rust-shlex-1.3.0
+                                    rust-smallvec-1.15.0
+                                    rust-socket2-0.5.9
+                                    rust-stable-deref-trait-1.2.0
+                                    rust-strsim-0.11.1
+                                    rust-syn-2.0.100
+                                    rust-synstructure-0.13.1
+                                    rust-tar-0.4.44
+                                    rust-tempfile-3.19.1
+                                    rust-termcolor-1.4.1
+                                    rust-terminal-size-0.4.2
+                                    rust-thiserror-2.0.12
+                                    rust-thiserror-impl-2.0.12
+                                    rust-tinystr-0.7.6
+                                    rust-tinyvec-1.9.0
+                                    rust-tinyvec-macros-0.1.1
+                                    rust-unicode-bom-2.0.3
+                                    rust-unicode-ident-1.0.18
+                                    rust-unicode-normalization-0.1.24
+                                    rust-url-2.5.4
+                                    rust-utf16-iter-1.0.5
+                                    rust-utf8-iter-1.0.4
+                                    rust-utf8parse-0.2.2
+                                    rust-vcpkg-0.2.15
+                                    rust-version-check-0.9.5
+                                    rust-walkdir-2.5.0
+                                    rust-wasi-0.14.2+wasi-0.2.4
+                                    rust-winapi-util-0.1.9
+                                    rust-windows-sys-0.52.0
+                                    rust-windows-sys-0.59.0
+                                    rust-windows-targets-0.52.6
+                                    rust-windows-aarch64-gnullvm-0.52.6
+                                    rust-windows-aarch64-msvc-0.52.6
+                                    rust-windows-i686-gnu-0.52.6
+                                    rust-windows-i686-gnullvm-0.52.6
+                                    rust-windows-i686-msvc-0.52.6
+                                    rust-windows-x86-64-gnu-0.52.6
+                                    rust-windows-x86-64-gnullvm-0.52.6
+                                    rust-windows-x86-64-msvc-0.52.6
+                                    rust-winnow-0.6.26
+                                    rust-winnow-0.7.6
+                                    rust-wit-bindgen-rt-0.39.0
+                                    rust-write16-1.0.0
+                                    rust-writeable-0.5.5
+                                    rust-xattr-1.5.0
+                                    rust-yoke-0.7.5
+                                    rust-yoke-derive-0.7.5
+                                    rust-zerocopy-0.7.35
+                                    rust-zerocopy-derive-0.7.35
+                                    rust-zerofrom-0.1.6
+                                    rust-zerofrom-derive-0.1.6
+                                    rust-zerovec-0.10.4
+                                    rust-zerovec-derive-0.10.3))
                      (tmux-plugin-sessionizer =>
                                               (list rust-aho-corasick-1.1.3
                                                rust-allocator-api2-0.2.21
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index a7e8c0f0bc9..bd621fc2344 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2193,7 +2193,7 @@ lot easier.")
 (define-public stgit-2
   (package
     (name "stgit")
-    (version "2.4.12")
+    (version "2.5.3")
     (source
      (origin
        (method git-fetch)
@@ -2202,36 +2202,10 @@ lot easier.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0kp3gwmxcjvphg1s0san0vyis8dsdaf02xsflc2b7kkg8m0r0mi3"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin (substitute* (find-files "." "^Cargo\\.toml$")
-                  (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
-                   (string-append "\"^" version)))))))
+        (base32 "0pxhl7fnycs4bx46x9m8v33lsf5hwp0fhqyihlr4sf7ms4b7adsc"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-anstyle" ,rust-anstyle-1)
-                       ("rust-anyhow" ,rust-anyhow-1)
-                       ("rust-bstr" ,rust-bstr-1)
-                       ("rust-bzip2-rs" ,rust-bzip2-rs-0.1)
-                       ("rust-clap" ,rust-clap-4)
-                       ("rust-ctrlc" ,rust-ctrlc-3)
-                       ("rust-curl" ,rust-curl-0.4)
-                       ("rust-encoding_rs" ,rust-encoding-rs-0.8)
-                       ("rust-flate2" ,rust-flate2-1)
-                       ("rust-gix" ,rust-gix-0.66)
-                       ("rust-indexmap" ,rust-indexmap-2)
-                       ("rust-is-terminal" ,rust-is-terminal-0.4)
-                       ("rust-jiff" ,rust-jiff-0.1)
-                       ("rust-serde" ,rust-serde-1)
-                       ("rust-serde-json" ,rust-serde-json-1)
-                       ("rust-strsim" ,rust-strsim-0.10)
-                       ("rust-tar" ,rust-tar-0.4)
-                       ("rust-tempfile" ,rust-tempfile-3)
-                       ("rust-termcolor" ,rust-termcolor-1)
-                       ("rust-thiserror" ,rust-thiserror-1)
-                       ("rust-winnow" ,rust-winnow-0.6))
-       #:install-source? #f
+     `(#:install-source? #f
        #:phases
        (modify-phases %standard-phases
          (add-after 'build 'build-extras
@@ -2259,7 +2233,7 @@ lot easier.")
            perl
            texinfo
            xmlto))
-    (inputs (list openssl zlib curl))
+    (inputs (cons* openssl zlib curl (cargo-inputs 'stgit-2)))
     (home-page "https://stacked-git.github.io/")
     (synopsis "Stacked Git (StGit) manages Git commits as a stack of patches")
     (description "StGit uses a patch stack workflow.  Each individual patch