diff --git a/srcpkgs/cargo/patches/nonexhaustive.patch b/srcpkgs/cargo/patches/nonexhaustive.patch new file mode 100644 index 0000000000..9aa8d7321c --- /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 0435ab42ef..12b003962c 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,9 +1,8 @@ # Template file for 'cargo' pkgname=cargo -version=0.20.0 +version=0.21.0 revision=1 _githash_installer=4f994850808a572e2cc8d43f968893c8e942e9bf -patch_args="-Np1" hostmakedepends="rust python curl cmake pkg-config" makedepends="libcurl-devel libgit2-devel" depends="rust" @@ -13,7 +12,7 @@ license="MIT, Apache-2.0" homepage="https://crates.io/" distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz https://github.com/rust-lang/rust-installer/archive/${_githash_installer}.tar.gz" -checksum="f0e21d23cffd3510ba8a65e6a4d1010073afc0e573d9d92c23d22b868ca0bc42 +checksum="7c36cfb515c37959f06f9e6e7de28fd40eac70b53079f8abdd55eba6ae49bbff dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae" nocross=yes @@ -26,13 +25,13 @@ x86_64-musl) ;; x86_64) distfiles+=" - https://static.rust-lang.org/dist/cargo-0.18.0-x86_64-unknown-linux-gnu.tar.gz" + https://static.rust-lang.org/dist/cargo-0.20.0-x86_64-unknown-linux-gnu.tar.gz" checksum+=" - 3601e95c968850230b137b849ff08a507e50d77ab584c779143a100f1843d8dd" + a677d13b01d00ad13edf75c7d1b484421c7fc09338bf9ed6d456b4685bb42ed1" ;; i686) distfiles+=" - https://static.rust-lang.org/dist/cargo-0.18.0-i686-unknown-linux-gnu.tar.gz" + https://static.rust-lang.org/dist/cargo-0.20.0-i686-unknown-linux-gnu.tar.gz" checksum+=" fbc5a0614345dfb2b41e133bd821257906a839753a9aa4c4590cc9d658164e58" ;;