diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 296611292a6..65c7da37367 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -3431,7 +3431,7 @@ tools.") (define-public git-absorb (package (name "git-absorb") - (version "0.6.16") + (version "0.7.0") (source (origin ;; crates.io does not include the manual page. @@ -3441,24 +3441,10 @@ tools.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0az15qskgpbsbbm6sx7mqbka85n9j2xk3h2yir0d2wz6myp85475")) - (snippet - #~(begin (delete-file "Documentation/git-absorb.1"))))) + (base32 "1cqz9m5w7sh7pgfcirvdpv6i7l7nfaqbgs88zx0wr5sqg5wk2zky")))) (build-system cargo-build-system) (arguments `(#:install-source? #f - #:cargo-inputs - (("rust-anyhow" ,rust-anyhow-1) - ("rust-clap" ,rust-clap-4) - ("rust-clap-complete" ,rust-clap-complete-4) - ("rust-clap-complete-nushell" ,rust-clap-complete-nushell-4) - ("rust-git2" ,rust-git2-0.19) - ("rust-memchr" ,rust-memchr-2) - ("rust-slog" ,rust-slog-2) - ("rust-slog-async" ,rust-slog-async-2) - ("rust-slog-term" ,rust-slog-term-2)) - #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile-3)) #:phases (modify-phases %standard-phases (add-after 'install 'install-manual-page @@ -3470,7 +3456,7 @@ tools.") "--no-xmllint" "--doctype=manpage" "--format=manpage" - "git-absorb.txt")) + "git-absorb.adoc")) (install-file "Documentation/git-absorb.1" man)))) (add-after 'install 'install-completions (lambda* (#:key native-inputs outputs #:allow-other-keys) @@ -3501,9 +3487,9 @@ tools.") (if (%current-target-system) (list this-package) '()) - (list asciidoc pkg-config))) + (list asciidoc git-minimal/pinned pkg-config))) (inputs - (list libgit2-1.8 zlib)) + (cons* libgit2-1.9 zlib (cargo-inputs 'git-absorb))) (home-page "https://github.com/tummychow/git-absorb") (synopsis "Git tool for making automatic fixup commits") (description diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm index 9562e7eac3c..ab233caf5cc 100644 --- a/gnu/packages/rust-crates.scm +++ b/gnu/packages/rust-crates.scm @@ -19345,6 +19345,120 @@ rust-zeroize-1.8.1 rust-zerovec-0.10.4 rust-zerovec-derive-0.10.3)) + (git-absorb => + (list 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.98 + rust-bitflags-2.9.0 + rust-cc-1.2.19 + rust-cfg-if-1.0.0 + rust-clap-4.5.37 + rust-clap-builder-4.5.37 + rust-clap-complete-4.5.47 + rust-clap-complete-nushell-4.5.5 + rust-clap-derive-4.5.32 + rust-clap-lex-0.7.4 + rust-colorchoice-1.0.3 + rust-deranged-0.4.0 + rust-dirs-next-2.0.0 + rust-dirs-sys-next-0.1.2 + rust-displaydoc-0.2.5 + rust-errno-0.3.11 + rust-fastrand-2.3.0 + rust-form-urlencoded-1.2.1 + rust-getrandom-0.2.15 + rust-getrandom-0.3.2 + rust-git2-0.20.1 + rust-heck-0.5.0 + rust-hermit-abi-0.5.0 + 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-is-terminal-0.4.16 + rust-is-terminal-polyfill-1.70.1 + rust-itoa-1.0.15 + rust-jobserver-0.1.33 + rust-libc-0.2.172 + rust-libgit2-sys-0.18.1+1.9.0 + rust-libredox-0.1.3 + rust-libz-sys-1.1.22 + rust-linux-raw-sys-0.9.4 + rust-litemap-0.7.5 + rust-log-0.4.27 + rust-memchr-2.7.4 + rust-num-conv-0.1.0 + rust-once-cell-1.21.3 + rust-percent-encoding-2.3.1 + rust-pkg-config-0.3.32 + rust-powerfmt-0.2.0 + rust-proc-macro2-1.0.95 + rust-quote-1.0.40 + rust-r-efi-5.2.0 + rust-redox-users-0.4.6 + rust-rustix-1.0.5 + rust-rustversion-1.0.20 + rust-serde-1.0.219 + rust-serde-derive-1.0.219 + rust-shlex-1.3.0 + rust-slog-2.7.0 + rust-slog-term-2.9.1 + rust-smallvec-1.15.0 + rust-stable-deref-trait-1.2.0 + rust-strsim-0.11.1 + rust-syn-2.0.100 + rust-synstructure-0.13.1 + rust-tempfile-3.19.1 + rust-term-0.7.0 + rust-terminal-size-0.4.2 + rust-thiserror-1.0.69 + rust-thiserror-impl-1.0.69 + rust-thread-local-1.1.8 + rust-time-0.3.41 + rust-time-core-0.1.4 + rust-time-macros-0.2.22 + rust-tinystr-0.7.6 + rust-unicode-ident-1.0.18 + 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-wasi-0.11.0+wasi-snapshot-preview1 + rust-wasi-0.14.2+wasi-0.2.4 + rust-winapi-0.3.9 + rust-winapi-i686-pc-windows-gnu-0.4.0 + rust-winapi-x86-64-pc-windows-gnu-0.4.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-wit-bindgen-rt-0.39.0 + rust-write16-1.0.0 + rust-writeable-0.5.5 + rust-yoke-0.7.5 + rust-yoke-derive-0.7.5 + rust-zerofrom-0.1.6 + rust-zerofrom-derive-0.1.6 + rust-zerovec-0.10.4 + rust-zerovec-derive-0.10.3)) (git-interactive-rebase-tool => (list rust-aho-corasick-1.1.3