diff --git a/srcpkgs/cargo/patches/nonexhaustive.patch b/srcpkgs/cargo/patches/nonexhaustive.patch new file mode 100644 index 00000000000..9aa8d7321c9 --- /dev/null +++ b/srcpkgs/cargo/patches/nonexhaustive.patch @@ -0,0 +1,14 @@ +Without this patch, cargo fails to build in rust 1.20 due to: +error[E0004]: non-exhaustive patterns: `&__Nonexhaustive { }` not covered + +--- src/cargo/util/errors.rs.orig ++++ src/cargo/util/errors.rs +@@ -83,7 +83,7 @@ + &CargoErrorKind::Parse(_) | + &CargoErrorKind::Git(_) | + &CargoErrorKind::Internal(_) | +- &CargoErrorKind::CargoTestErrorKind(_) => false ++ &CargoErrorKind::CargoTestErrorKind(_) | _ => false + } + } + } diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 3eb39c6b39d..d0fd91f9162 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,6 +1,6 @@ # Template file for 'cargo' pkgname=cargo -version=0.21.1 +version=0.22.0 revision=1 _githash_installer=4f994850808a572e2cc8d43f968893c8e942e9bf hostmakedepends="rust python curl cmake pkg-config" @@ -12,7 +12,7 @@ license="MIT, Apache-2.0" homepage="https://crates.io/" distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz https://github.com/rust-lang/rust-installer/archive/${_githash_installer}.tar.gz" -checksum="f2464d3cb3e431e45191b6f70e415c320d227ef3c3d134cea4e86357c0c72a33 +checksum="6740e2f8d035a5a5246a12e84a141d37ad4c2b826355aff497e6f1fcfb637aef dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae" nocross=yes