diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2024-11-20 20:54:53 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2024-11-28 11:05:34 +0200 |
commit | 58416091c03ce583e05163b3e0d90aaa790be647 (patch) | |
tree | da6a00ddaf5f4140121bdb0213176754751ee057 | |
parent | 023fa34e56c172976d0e7c004f1ad7031ef89b6b (diff) | |
download | guix-58416091c03ce583e05163b3e0d90aaa790be647.tar.gz guix-58416091c03ce583e05163b3e0d90aaa790be647.zip |
gnu: rust-cargo: Update to 0.83.0.
* gnu/packages/rust-apps.scm (rust-cargo): Update to 0.83.0.
[source]: Add snippet to allow for newer versions of dependencies.
[cargo-inputs]: Add rust-same-file-1, rust-supports-unicode-3,
rust-tracing-chrome-0.7. Replace rust-annotate-snippets-0.10 with 0.11,
rust-base64-0.21 with 0.22, rust-cargo-util-schemas-0.2 with 0.6,
rust-git2-0.18 with 0.19, rust-git2-curl-0.19 with 0.20, rust-gix-0.57
with 0.64, rust-itertools-0.12 with 0.13, rust-libgit2-sys-0.16 with
0.17, rust-opener-0.6 with 0.7, rust-rusqlite-0.30 with 0.32,
rust-supports-hyperlinks-2 with 3, rust-toml-edit-0.21 with 0.22,
rust-windows-sys-0.52 with 0.59. Remove rust-gix-features-0.37
[cargo-development-inputs]: Add rust-annotate-snippets-0.11,
rust-cargo-test-support-0.4, rust-gix-0.64. Replace rust-snapbox-0.4
with 0.6.
[inputs]: Add libgit2-1.8. Remove libgit2-1.7.
Change-Id: I43ca72ecb0c0b0ca486914c22b4f2b060baf5954
-rw-r--r-- | gnu/packages/rust-apps.scm | 51 |
1 files changed, 31 insertions, 20 deletions
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index cd1e83fa0b..63238fd85b 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -2969,23 +2969,28 @@ background agent taking care of maintaining the necessary state.") (define-public rust-cargo (package (name "rust-cargo") - (version "0.78.1") + (version "0.83.0") (source (origin (method url-fetch) (uri (crate-uri "cargo" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1p6564hg38xxbpjiiqxmnm1kmysxfjh0kbm5g56n85c3s0wmwc6n")))) + (base32 "0yvb3vh87ngrfsgvl6r2drjrq5h1yw07yhq6c6kc39wmigc1z4l2")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; unresolved import `cargo_test_support` + `(#:tests? #f ; Some of the tests tests hang. #:cargo-inputs - (("rust-annotate-snippets" ,rust-annotate-snippets-0.10) + (("rust-annotate-snippets" ,rust-annotate-snippets-0.11) ("rust-anstream" ,rust-anstream-0.6) ("rust-anstyle" ,rust-anstyle-1) ("rust-anyhow" ,rust-anyhow-1) - ("rust-base64" ,rust-base64-0.21) + ("rust-base64" ,rust-base64-0.22) ("rust-bytesize" ,rust-bytesize-1) ("rust-cargo-credential" ,rust-cargo-credential-0.4) ("rust-cargo-credential-libsecret" ,rust-cargo-credential-libsecret-0.4) @@ -2993,7 +2998,7 @@ background agent taking care of maintaining the necessary state.") ("rust-cargo-credential-wincred" ,rust-cargo-credential-wincred-0.4) ("rust-cargo-platform" ,rust-cargo-platform-0.1) ("rust-cargo-util" ,rust-cargo-util-0.2) - ("rust-cargo-util-schemas" ,rust-cargo-util-schemas-0.2) + ("rust-cargo-util-schemas" ,rust-cargo-util-schemas-0.6) ("rust-clap" ,rust-clap-4) ("rust-color-print" ,rust-color-print-0.3) ("rust-crates-io" ,rust-crates-io-0.40) @@ -3001,10 +3006,9 @@ background agent taking care of maintaining the necessary state.") ("rust-curl-sys" ,rust-curl-sys-0.4) ("rust-filetime" ,rust-filetime-0.2) ("rust-flate2" ,rust-flate2-1) - ("rust-git2" ,rust-git2-0.18) - ("rust-git2-curl" ,rust-git2-curl-0.19) - ("rust-gix" ,rust-gix-0.57) - ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-git2" ,rust-git2-0.19) + ("rust-git2-curl" ,rust-git2-curl-0.20) + ("rust-gix" ,rust-gix-0.64) ("rust-glob" ,rust-glob-0.3) ("rust-hex" ,rust-hex-0.4) ("rust-hmac" ,rust-hmac-0.12) @@ -3014,21 +3018,22 @@ background agent taking care of maintaining the necessary state.") ("rust-ignore" ,rust-ignore-0.4) ("rust-im-rc" ,rust-im-rc-15) ("rust-indexmap" ,rust-indexmap-2) - ("rust-itertools" ,rust-itertools-0.12) + ("rust-itertools" ,rust-itertools-0.13) ("rust-jobserver" ,rust-jobserver-0.1) ("rust-lazycell" ,rust-lazycell-1) ("rust-libc" ,rust-libc-0.2) - ("rust-libgit2-sys" ,rust-libgit2-sys-0.16) + ("rust-libgit2-sys" ,rust-libgit2-sys-0.17) ("rust-memchr" ,rust-memchr-2) - ("rust-opener" ,rust-opener-0.6) + ("rust-opener" ,rust-opener-0.7) ("rust-openssl" ,rust-openssl-0.10) ("rust-os-info" ,rust-os-info-3) ("rust-pasetors" ,rust-pasetors-0.6) ("rust-pathdiff" ,rust-pathdiff-0.2) ("rust-rand" ,rust-rand-0.8) ("rust-regex" ,rust-regex-1) - ("rust-rusqlite" ,rust-rusqlite-0.30) + ("rust-rusqlite" ,rust-rusqlite-0.32) ("rust-rustfix" ,rust-rustfix-0.8) + ("rust-same-file" ,rust-same-file-1) ("rust-semver" ,rust-semver-1) ("rust-serde" ,rust-serde-1) ("rust-serde-untagged" ,rust-serde-untagged-0.1) @@ -3036,25 +3041,31 @@ background agent taking care of maintaining the necessary state.") ("rust-serde-json" ,rust-serde-json-1) ("rust-sha1" ,rust-sha1-0.10) ("rust-shell-escape" ,rust-shell-escape-0.1) - ("rust-supports-hyperlinks" ,rust-supports-hyperlinks-2) + ("rust-supports-hyperlinks" ,rust-supports-hyperlinks-3) + ("rust-supports-unicode" ,rust-supports-unicode-3) ("rust-tar" ,rust-tar-0.4) ("rust-tempfile" ,rust-tempfile-3) ("rust-time" ,rust-time-0.3) ("rust-toml" ,rust-toml-0.8) - ("rust-toml-edit" ,rust-toml-edit-0.21) + ("rust-toml-edit" ,rust-toml-edit-0.22) ("rust-tracing" ,rust-tracing-0.1) + ("rust-tracing-chrome" ,rust-tracing-chrome-0.7) ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) ("rust-unicase" ,rust-unicase-2) ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-url" ,rust-url-2) ("rust-walkdir" ,rust-walkdir-2) - ("rust-windows-sys" ,rust-windows-sys-0.52)) - #:cargo-development-inputs (("rust-same-file" ,rust-same-file-1) - ("rust-snapbox" ,rust-snapbox-0.4)))) + ("rust-windows-sys" ,rust-windows-sys-0.59)) + #:cargo-development-inputs + (("rust-annotate-snippets" ,rust-annotate-snippets-0.11) + ("rust-cargo-test-support" ,rust-cargo-test-support-0.4) + ("rust-gix" ,rust-gix-0.64) + ("rust-same-file" ,rust-same-file-1) + ("rust-snapbox" ,rust-snapbox-0.6)))) (native-inputs (list pkg-config)) (inputs - (list curl libssh2 libgit2-1.7 openssl zlib)) + (list curl libssh2 libgit2-1.8 openssl zlib)) (home-page "https://crates.io") (synopsis "Package manager for Rust") (description "Cargo, a package manager for Rust. This package provides |