From: Paul Alesius <paul@unnservice.com>
To: 54509@debbugs.gnu.org
Subject: [bug#54509] rust-cargo: Update to 0.60.0 to support Edition2021 projects
Date: Mon, 21 Mar 2022 18:46:41 +0100 [thread overview]
Message-ID: <CAL8jUGV9EwAm9KLKFcgjHiPV_GrQSZV4ec6Epcb0otXBNaD17Q@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
The current rust-cargo version is 0.53.0, this supports rust
edition2018 projects.
To install the latest cargo from crates.io using the existing version
(cargo install cargo), it will fail because the latest version is an
"edition2021" rust-cargo project.
-- log
Caused by:
failed to parse manifest at `/xyz/cargo-0.59.0/Cargo.toml`
Caused by:
feature `edition2021` is required
--
This patch updates rust-cargo and its dependencies to support the the
latest rust edition2021, and edition2021 cargo projects.
With regards,
- Paul
[-- Attachment #2: rust-cargo-0.60.0.patch --]
[-- Type: text/x-patch, Size: 10265 bytes --]
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 90c95b6368..5bfb545389 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9763,10 +9763,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)
@@ -9775,7 +9775,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
@@ -9786,6 +9786,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)
@@ -9793,7 +9794,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)
@@ -9815,22 +9816,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)
@@ -10094,7 +10096,7 @@ (define-public rust-cargo-lock-7
(define-public rust-cargo-platform-0.1
(package
(name "rust-cargo-platform")
- (version "0.1.1")
+ (version "0.1.2")
(source
(origin
(method url-fetch)
@@ -10103,7 +10105,7 @@ (define-public rust-cargo-platform-0.1
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1mzi60pf0z83qkzqp7jwd61xnqz2b5ydsj7rnnikbgyicd5989h2"))))
+ "09zsf76b9yr02jh17xq925xp1w824w2bwvb78fd0gpx5m1fq5nyb"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -10114,6 +10116,25 @@ (define-public rust-cargo-platform-0.1
supported by Cargo.")
(license (list license:expat license:asl2.0))))
+(define-public rust-cargo-util-0.1
+ (package
+ (name "rust-cargo-util")
+ (version "0.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "cargo-util" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1sz0gzcyp9ycb4zwj69qs9gd8kn9hv9nh2dq42c59x5xccqph755"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/rust-lang/cargo")
+ (synopsis "Utils for Cargo")
+ (description "Miscellaneous support code used by Cargo.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-cargon-0.0
(package
(name "rust-cargon")
@@ -13801,7 +13822,7 @@ (define-public rust-crates-index-0.5
(define-public rust-crates-io-0.33
(package
(name "rust-crates-io")
- (version "0.33.0")
+ (version "0.33.1")
(source
(origin
(method url-fetch)
@@ -13810,7 +13831,7 @@ (define-public rust-crates-io-0.33
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "147mggf85fz77vsrzsvsxxwid4f4fg30zwfyirx7sl1k7y33hw91"))))
+ "0nmpzr697a6v12ljwpmjrhqpmkf784nsm8m1g6jwadmkq96p3mxj"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -15585,14 +15606,14 @@ (define-public rust-cty-0.2
(define-public rust-curl-0.4
(package
(name "rust-curl")
- (version "0.4.34")
+ (version "0.4.43")
(source
(origin
(method url-fetch)
(uri (crate-uri "curl" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0vkm6fyizf8m9yxpv3n5pm9ag3bwlyqa6nz2ga8qkzm5y4m1cs72"))))
+ (base32 "07v5s3qafyl9gnnlzbddgg5fzy41gncy00ahbbv46nr0xyp5bn1p"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #false ;require internet access
@@ -15622,7 +15643,7 @@ (define-public rust-curl-0.4
(define-public rust-curl-sys-0.4
(package
(name "rust-curl-sys")
- (version "0.4.39+curl-7.74.0")
+ (version "0.4.53+curl-7.82.0")
(source
(origin
(method url-fetch)
@@ -15630,7 +15651,7 @@ (define-public rust-curl-sys-0.4
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0x7qhq7c3b1vmp3740yiigzm09qvkzpdf578jjrs0s3v3s3cxa07"))
+ "0lh398vd34c55afyw5csbxqmnp7caxgpgci3y89c60lmb9d914l0"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "curl") #t))))
@@ -30137,7 +30158,7 @@ (define-public rust-jni-sys-0.3
(define-public rust-jobserver-0.1
(package
(name "rust-jobserver")
- (version "0.1.22")
+ (version "0.1.24")
(source
(origin
(method url-fetch)
@@ -30146,7 +30167,7 @@ (define-public rust-jobserver-0.1
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1zg7p4khibisbvd8b1lqvvni6lr00g49d4bq2zj6m76bs7jmlbwp"))))
+ "1yn1vxbbqv7dqir6qbfcj8h8ddjf89m5mhvm36h13xx7k5raf9dg"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -39195,10 +39216,10 @@ (define-public rust-open-1
(("rust-pathdiff" ,rust-pathdiff-0.2)
("rust-winapi" ,rust-winapi-0.3))))))
-(define-public rust-opener-0.4
+(define-public rust-opener-0.5
(package
(name "rust-opener")
- (version "0.4.1")
+ (version "0.5.0")
(source
(origin
(method url-fetch)
@@ -39207,7 +39228,7 @@ (define-public rust-opener-0.4
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1bpknqvhqkalhmq8n2m97apc0r3y194ppybl1qxay34xr83p848k"))))
+ "0lkrn4fv1h4m8gmp7ll6x7vjvb6kls2ngwa5cgsh2ix5fb6yp8sf"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -39569,14 +39590,14 @@ (define-public rust-ordermap-0.3
(define-public rust-os-info-3
(package
(name "rust-os-info")
- (version "3.0.6")
+ (version "3.0.7")
(source
(origin
(method url-fetch)
(uri (crate-uri "os_info" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1pbcf2in8i9w6zjzk6jmrd89gm5h7qpyqi3hvkl0axpzp1m57lmk"))))
+ (base32 "09x2sm4pgcpk14hakj4iq0zkglx1bwxlq3a5mbwc737dpwh11jba"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -51059,6 +51080,40 @@ (define-public rust-rustdoc-stripper-0.1
"This package provides a tool to manipulate rustdoc comments.")
(license license:asl2.0)))
+(define-public rust-rustfix-0.6
+ (package
+ (name "rust-rustfix")
+ (version "0.6.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustfix" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0apkjxv3z70vhnyz2kpwsivvndk6qk7kkp0rf7sg8pk7q1gy02vg"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1))
+ #:cargo-development-inputs
+ (("rust-difference" ,rust-difference-2)
+ ("rust-duct" ,rust-duct-0.13)
+ ("rust-env-logger" ,rust-env-logger-0.6)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-proptest" ,rust-proptest-0.9)
+ ("rust-tempdir" ,rust-tempdir-0.3))))
+ (home-page "https://github.com/rust-lang/rustfix")
+ (synopsis "Automatically apply the suggestions made by rustc")
+ (description
+ "Automatically apply the suggestions made by rustc.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-rustfix-0.5
(package
(name "rust-rustfix")
@@ -60554,7 +60609,7 @@ (define-public rust-tap-1
(define-public rust-tar-0.4
(package
(name "rust-tar")
- (version "0.4.26")
+ (version "0.4.36")
(source
(origin
(method url-fetch)
@@ -60562,7 +60617,7 @@ (define-public rust-tar-0.4
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1lr6v3cpkfxd2lk5ll2jd8wr1xdskwj35smnh5sfb8xvzzxnn6dk"))))
+ "0iz40bd47xr69dsbckd6rv5ry2nqb2dp3z850q41pvpnmk6xk441"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; Test tarballs not included in crate.
next reply other threads:[~2022-03-21 17:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-21 17:46 Paul Alesius [this message]
2022-03-21 18:46 ` [bug#54509] rust-cargo: Update to 0.60.0 to support Edition2021 projects Maxime Devos
2022-03-21 20:59 ` Paul Alesius
2023-02-09 13:18 ` bug#54509: " Maxim Cournoyer
2022-06-29 22:57 ` [bug#54509] bump: make rust-cargo understand rust-edition2021 which rustc already does Mekeor Melire
2022-06-30 8:10 ` Maxime Devos
2022-07-01 21:48 ` Mekeor Melire
2022-07-02 11:27 ` Tobias Geerinckx-Rice via Guix-patches via
2022-07-02 11:35 ` Tobias Geerinckx-Rice via Guix-patches via
2022-07-06 14:06 ` Mekeor Melire
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAL8jUGV9EwAm9KLKFcgjHiPV_GrQSZV4ec6Epcb0otXBNaD17Q@mail.gmail.com \
--to=paul@unnservice.com \
--cc=54509@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).