From 8a2e976d6c1c578ccc799bbd0dd9930feb2d4a21 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 10:24:11 +0200 Subject: [PATCH] gnu: rust-cargo: Update to 0.68. * gnu/packages/crates-io.scm (rust-cargo-0.60): Replace with 0.68. [cargo-inputs]: Remove rust-atty-0.2, rust-core-foundation-0.9, rust-crossbeam-utils-0.8, rust-crypto-hash-0.3, rust-miow-0.3, rust-num-cpus-1, rust-rand-0.8, rust-same-file-1, rust-socket2-0.4, rust-toml-0.5. Add rust-base64-0.13, rust-hmac-0.12, rust-http-auth-0.1, rust-indexmap-1, rust-is-terminal-0.4, rust-itertools-0.10, rust-pathdiff-0.2, rust-serde-value-0.7, rust-sha1-0.10, rust-toml-edit-0.15. Replace rust-cargo-util-0.1 with 0.2, rust-clap-2 with 4, rust-crates-io-0.33 with 0.35, rust-env-logger-0.9 with 0.10, rust-git2-0.13 with 0.16, rust-git2-curl-0.14 with 0.17, rust-libgit2-sys-0.12 with 0.14, rust-semver-0.10 with 1. [cargo-development-inputs]: Add rust-same-file-1, rust-snapbox-0.4. --- gnu/packages/crates-io.scm | 47 ++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index be329b18cc..4135d756c0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9557,10 +9557,10 @@ capabilities.") ("rust-error-chain" ,rust-error-chain-0.12) ("rust-libc" ,rust-libc-0.2)))))) -(define-public rust-cargo-0.60 +(define-public rust-cargo-0.68 (package (name "rust-cargo") - (version "0.60.0") + (version "0.68.0") (source (origin (method url-fetch) @@ -9569,7 +9569,7 @@ capabilities.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0xws4y7h4mmq8flnzsgf6fph2hx3rjgypyll4wzp15035ymly6dw")))) + "0kgj3kh3lkdviz2y2apmkkh1yy7n88aj6gfb96l0gm1w2xq80pnz")))) (build-system cargo-build-system) (arguments `(;; The test suite is disabled as the internal 'cargo-test-macro' and @@ -9577,64 +9577,67 @@ capabilities.") #:tests? #f #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) - ("rust-atty" ,rust-atty-0.2) + ("rust-base64" ,rust-base64-0.13) ("rust-bytesize" ,rust-bytesize-1) ("rust-cargo-platform" ,rust-cargo-platform-0.1) - ("rust-cargo-util" ,rust-cargo-util-0.1) - ("rust-clap" ,rust-clap-2) - ("rust-core-foundation" ,rust-core-foundation-0.9) - ("rust-crates-io" ,rust-crates-io-0.33) - ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) - ("rust-crypto-hash" ,rust-crypto-hash-0.3) + ("rust-cargo-util" ,rust-cargo-util-0.2) + ("rust-clap" ,rust-clap-4) + ("rust-crates-io" ,rust-crates-io-0.35) ("rust-curl" ,rust-curl-0.4) ("rust-curl-sys" ,rust-curl-sys-0.4) - ("rust-env-logger" ,rust-env-logger-0.9) + ("rust-env-logger" ,rust-env-logger-0.10) ("rust-filetime" ,rust-filetime-0.2) ("rust-flate2" ,rust-flate2-1) ("rust-flate2" ,rust-flate2-1) ("rust-fwdansi" ,rust-fwdansi-1) - ("rust-git2" ,rust-git2-0.13) - ("rust-git2-curl" ,rust-git2-curl-0.14) + ("rust-git2" ,rust-git2-0.16) + ("rust-git2-curl" ,rust-git2-curl-0.17) ("rust-glob" ,rust-glob-0.3) ("rust-hex" ,rust-hex-0.4) + ("rust-hmac" ,rust-hmac-0.12) ("rust-home" ,rust-home-0.5) + ("rust-http-auth" ,rust-http-auth-0.1) ("rust-humantime" ,rust-humantime-2) ("rust-ignore" ,rust-ignore-0.4) ("rust-im-rc" ,rust-im-rc-15) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-is-terminal" ,rust-is-terminal-0.4) + ("rust-itertools" ,rust-itertools-0.10) ("rust-jobserver" ,rust-jobserver-0.1) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-lazycell" ,rust-lazycell-1) ("rust-libc" ,rust-libc-0.2) - ("rust-libgit2-sys" ,rust-libgit2-sys-0.12) + ("rust-libgit2-sys" ,rust-libgit2-sys-0.14) ("rust-log" ,rust-log-0.4) ("rust-memchr" ,rust-memchr-2) - ("rust-miow" ,rust-miow-0.3) - ("rust-num-cpus" ,rust-num-cpus-1) ("rust-opener" ,rust-opener-0.5) ("rust-openssl" ,rust-openssl-0.10) ("rust-os-info" ,rust-os-info-3) + ("rust-pathdiff" ,rust-pathdiff-0.2) ("rust-percent-encoding" ,rust-percent-encoding-2) ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4) - ("rust-rand" ,rust-rand-0.8) ("rust-rustc-workspace-hack" ,rust-rustc-workspace-hack-1) ("rust-rustfix" ,rust-rustfix-0.6) - ("rust-same-file" ,rust-same-file-1) - ("rust-semver" ,rust-semver-0.10) + ("rust-semver" ,rust-semver-1) ("rust-serde" ,rust-serde-1) + ("rust-serde-value" ,rust-serde-value-0.7) ("rust-serde-ignored" ,rust-serde-ignored-0.1) ("rust-serde-json" ,rust-serde-json-1) + ("rust-sha1" ,rust-sha1-0.10) ("rust-shell-escape" ,rust-shell-escape-0.1) - ("rust-socket2" ,rust-socket2-0.4) ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1) ("rust-tar" ,rust-tar-0.4) ("rust-tempfile" ,rust-tempfile-3) ("rust-termcolor" ,rust-termcolor-1) - ("rust-toml" ,rust-toml-0.5) + ("rust-toml-edit" ,rust-toml-edit-0.15) ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-unicode-xid" ,rust-unicode-xid-0.2) ("rust-url" ,rust-url-2) ("rust-walkdir" ,rust-walkdir-2) - ("rust-winapi" ,rust-winapi-0.3)))) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-same-file" ,rust-same-file-1) + ("rust-snapbox" ,rust-snapbox-0.4)))) (native-inputs (list pkg-config)) (inputs