~ruther/guix-local

6d9597088dbc7795278309dddeaafbce761c98ca — Paul Alesius 3 years ago 6fa620a
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 <maxim.cournoyer@gmail.com>
Co-authored-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2 files changed, 15 insertions(+), 12 deletions(-)

M gnu/packages/crates-io.scm
M gnu/packages/rust-apps.scm
M gnu/packages/crates-io.scm => gnu/packages/crates-io.scm +9 -7
@@ 9354,10 9354,10 @@ capabilities.")
        ("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 @@ capabilities.")
        (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 @@ capabilities.")
        ("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 @@ capabilities.")
        ("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 @@ capabilities.")
        ("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)

M gnu/packages/rust-apps.scm => gnu/packages/rust-apps.scm +6 -5
@@ 12,7 12,7 @@
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.ccom>
;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2021 jgart <jgart@dismail.de>
;;; Copyright © 2021 Nicolas Graves <ngraves@ngraves.fr>


@@ 1836,10 1836,11 @@ language.  It is a part of a larger rls-2.0 effort to create excellent IDE
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 @@ support for Rust.")
         (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)