diff --git a/srcpkgs/cargo/patches/crossbeam-ppcle.patch b/srcpkgs/cargo/patches/crossbeam-ppcle.patch deleted file mode 100644 index 36d9256e107..00000000000 --- a/srcpkgs/cargo/patches/crossbeam-ppcle.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/crossbeam-utils/no_atomic.rs -+++ b/crossbeam-utils/no_atomic.rs -@@ -33,6 +33,8 @@ const NO_ATOMIC_64: &[&str] = &[ - "powerpc-unknown-linux-gnu", - "powerpc-unknown-linux-gnuspe", - "powerpc-unknown-linux-musl", -+ "powerpcle-unknown-linux-gnu", -+ "powerpcle-unknown-linux-musl", - "powerpc-unknown-netbsd", - "powerpc-unknown-openbsd", - "powerpc-wrs-vxworks", diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index e557bbe2080..09be821c96e 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,8 +1,8 @@ # Template file for 'cargo' pkgname=cargo -version=1.64.0 +version=1.68.2 revision=1 -create_wrksrc=yes +_cargo_revision=0.69.1 build_helper=rust hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel" makedepends="rust libcurl-devel openssl-devel" @@ -11,10 +11,8 @@ short_desc="Rust package manager" maintainer="Enno Boland " license="MIT, Apache-2.0" homepage="https://crates.io/" -distfiles="https://github.com/rust-lang/cargo/archive/rust-${version}.tar.gz - https://github.com/crossbeam-rs/crossbeam/archive/refs/tags/crossbeam-utils-0.8.8.tar.gz" -checksum="8363ee37e1ff85c7322f0619087b1230f43852dcb26316627a1a703ed20ea4b7 - 52c451910203cd9002cc4b85cff95f45c6ba245392801e80d7898ca5c3c3ab29" +distfiles="https://github.com/rust-lang/cargo/archive/refs/tags/${_cargo_revision}.tar.gz" +checksum=8e41d61c7d360ad934a037489ce7e404ad4bdd0e71286ca73de8380656deccaa replaces="cargo-tree>=0" build_options="static bindist" @@ -28,21 +26,6 @@ if [ -z "$_build_static" ]; then makedepends+=" libgit2-devel" fi -post_extract() { - mv cargo-rust-${version}/* . - mv crossbeam-crossbeam-utils-* crossbeam-utils -} - -post_patch() { - rm crossbeam-utils/crossbeam-utils/no_atomic.rs - cp crossbeam-utils/no_atomic.rs crossbeam-utils/crossbeam-utils - - cat >> Cargo.toml <<- EOF - [patch.crates-io] - crossbeam-utils = { path = './crossbeam-utils/crossbeam-utils' } - EOF -} - do_build() { local cargs