From 7acadd9de0ccf9748f15211d2b8973fd3408fbb3 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 11 Sep 2017 17:55:58 +0200 Subject: [PATCH] cargo: update to 0.21.1. --- srcpkgs/cargo/patches/nonexhaustive.patch | 14 -------------- srcpkgs/cargo/template | 6 +++--- 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/cargo/patches/nonexhaustive.patch diff --git a/srcpkgs/cargo/patches/nonexhaustive.patch b/srcpkgs/cargo/patches/nonexhaustive.patch deleted file mode 100644 index 9aa8d7321c9..00000000000 --- a/srcpkgs/cargo/patches/nonexhaustive.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 4a574684755..3eb39c6b39d 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,6 +1,6 @@ # Template file for 'cargo' pkgname=cargo -version=0.21.0 +version=0.21.1 revision=1 _githash_installer=4f994850808a572e2cc8d43f968893c8e942e9bf hostmakedepends="rust python curl cmake pkg-config" @@ -10,9 +10,9 @@ short_desc="Rust package manager" maintainer="Leah Neukirchen " license="MIT, Apache-2.0" homepage="https://crates.io/" -distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz +distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz https://github.com/rust-lang/rust-installer/archive/${_githash_installer}.tar.gz" -checksum="7c36cfb515c37959f06f9e6e7de28fd40eac70b53079f8abdd55eba6ae49bbff +checksum="f2464d3cb3e431e45191b6f70e415c320d227ef3c3d134cea4e86357c0c72a33 dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae" nocross=yes