From 6d9597088dbc7795278309dddeaafbce761c98ca Mon Sep 17 00:00:00 2001 From: Paul Alesius Date: Wed, 8 Feb 2023 14:33:01 -0500 Subject: [PATCH] gnu: rust-cargo: Update to 0.60.0. * gnu/packages/crates-io.scm (rust-cargo-0.60): Update to 0.60.0. [cargo-inputs]: Add rust-cargo-util-0.1. Replace rust-env-logger-0.8 with rust-env-logger-0.9. Replace rust-opener-0.4 with rust-opener-0.5. Add rust-os-info-3. Replace rust-rustfix-0.5 with rust-rustfix-0.6. Add rust-socket2-0.4. Remove duplicate rust-tar-0.4. * gnu/packages/rust-apps.scm (rust-cargo-c): Update to 0.9.8+cargo-0.60. [cargo-inputs]: Replace rust-cbindgen-0.19 with rust-cbindgen-0.20. Replace rust-cargo-0.53 with rust-cargo-0.60. Signed-off-by: Maxim Cournoyer Co-authored-by: Maxim Cournoyer --- gnu/packages/crates-io.scm | 16 +++++++++------- gnu/packages/rust-apps.scm | 11 ++++++----- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 00e32807b5..9cfcb161ae 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9354,10 +9354,10 @@ (define-public rust-caps-0.3 ("rust-error-chain" ,rust-error-chain-0.12) ("rust-libc" ,rust-libc-0.2)))))) -(define-public rust-cargo-0.53 +(define-public rust-cargo-0.60 (package (name "rust-cargo") - (version "0.53.0") + (version "0.60.0") (source (origin (method url-fetch) @@ -9366,7 +9366,7 @@ (define-public rust-cargo-0.53 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "12ns9v4dd8vnvsaqgd897h2zc19w00i5ii3slda653zbhfzm6zna")))) + "0xws4y7h4mmq8flnzsgf6fph2hx3rjgypyll4wzp15035ymly6dw")))) (build-system cargo-build-system) (arguments `(;; The test suite is disabled as the internal 'cargo-test-macro' and @@ -9377,6 +9377,7 @@ (define-public rust-cargo-0.53 ("rust-atty" ,rust-atty-0.2) ("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) @@ -9384,7 +9385,7 @@ (define-public rust-cargo-0.53 ("rust-crypto-hash" ,rust-crypto-hash-0.3) ("rust-curl" ,rust-curl-0.4) ("rust-curl-sys" ,rust-curl-sys-0.4) - ("rust-env-logger" ,rust-env-logger-0.8) + ("rust-env-logger" ,rust-env-logger-0.9) ("rust-filetime" ,rust-filetime-0.2) ("rust-flate2" ,rust-flate2-1) ("rust-flate2" ,rust-flate2-1) @@ -9406,22 +9407,23 @@ (define-public rust-cargo-0.53 ("rust-memchr" ,rust-memchr-2) ("rust-miow" ,rust-miow-0.3) ("rust-num-cpus" ,rust-num-cpus-1) - ("rust-opener" ,rust-opener-0.4) + ("rust-opener" ,rust-opener-0.5) ("rust-openssl" ,rust-openssl-0.10) + ("rust-os-info" ,rust-os-info-3) ("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.5) + ("rust-rustfix" ,rust-rustfix-0.6) ("rust-same-file" ,rust-same-file-1) ("rust-semver" ,rust-semver-0.10) ("rust-serde" ,rust-serde-1) ("rust-serde-ignored" ,rust-serde-ignored-0.1) ("rust-serde-json" ,rust-serde-json-1) ("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-tar" ,rust-tar-0.4) ("rust-tempfile" ,rust-tempfile-3) ("rust-termcolor" ,rust-termcolor-1) ("rust-toml" ,rust-toml-0.5) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index ae8e469bed..ba32757dd1 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Alexandru-Sergiu Marton -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2023 Maxim Cournoyer ;;; Copyright © 2021, 2022 Petr Hodina ;;; Copyright © 2021 jgart ;;; Copyright © 2021 Nicolas Graves @@ -1836,10 +1836,11 @@ (define-public rust-analyzer support for Rust.") (license (list license:expat license:asl2.0)))) +;;; Note: keep in sync with our current Rust/Cargo version. (define-public rust-cargo-c (package (name "rust-cargo-c") - (version "0.8.1+cargo-0.53") + (version "0.9.8+cargo-0.60") (source (origin (method url-fetch) @@ -1848,12 +1849,12 @@ (define-public rust-cargo-c (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0fwdxhdj2963xr6xfqr56i7hikhsdv562vgxq2dj3h2mi3dil1k6")))) + "1zdzs3drjr9p6chg32inyi05rfv1c12nkk4bi7qpha12m6rsn26d")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-cbindgen" ,rust-cbindgen-0.19) - ("rust-cargo" ,rust-cargo-0.53) ; + (("rust-cbindgen" ,rust-cbindgen-0.20) + ("rust-cargo" ,rust-cargo-0.60) ("rust-anyhow" ,rust-anyhow-1) ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4) ("rust-structopt" ,rust-structopt-0.3)