Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NOMERGE] Rust update bootstrap distfiles #3297

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions srcpkgs/cargo/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=0.29.0
revision=2
version=0.30.0
revision=1
hostmakedepends="rust python curl cmake pkg-config"
makedepends="libcurl-devel libgit2-devel"
depends="rust"
Expand All @@ -10,27 +10,28 @@ maintainer="Enno Boland <[email protected]>"
license="MIT, Apache-2.0"
homepage="https://crates.io/"
distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz"
checksum=9aedb9536ec0b92059ed06b79a72798daf14e3fbcf29fac308ac07d23a9493d3
checksum=82f3ba49192b74b115b8aeca9db24deca022ee5e6351292611ab5b50e4455251
nocross=yes
_rust_dist_version=0.30.0

case "$XBPS_MACHINE" in
x86_64-musl)
distfiles+="
https://alpha.de.repo.voidlinux.org/distfiles/cargo-0.29.0-x86_64-unknown-linux-musl-libgit2-27.tar.gz"
https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_rust_dist_version}-x86_64-unknown-linux-musl.tar.gz"
checksum+="
a46cb16e1008032277d744b74cba16a107539b12b8fbfd763c4cc1f80ee5568c"
e9344cbf3db669383cb3492d12bcd42d9130665f577be9ad4d2028011c7b1fae"
;;
x86_64)
distfiles+="
https://static.rust-lang.org/dist/cargo-0.29.0-x86_64-unknown-linux-gnu.tar.gz"
https://static.rust-lang.org/dist/cargo-${_rust_dist_version}-x86_64-unknown-linux-gnu.tar.gz"
checksum+="
a5e7749767c47669ed9b6e32c6fb8eda6b0fe1c63ac73a6d4666b5c1352bad24"
b6012ef67923b67b9b558628cc41dd90a688742bf23e9b46ad8839d898f1b0b1"
;;
i686)
distfiles+="
https://static.rust-lang.org/dist/cargo-0.29.0-i686-unknown-linux-gnu.tar.gz"
https://static.rust-lang.org/dist/cargo-${_rust_dist_version}-i686-unknown-linux-gnu.tar.gz"
checksum+="
ec9ba3aa064719222bb59de4cf8f2ad061bb31288e7dd4e98b80215203aa5876"
2fc5f7f5b128de456a9e1e3f5f4ef2c6d3169dbfe078931d9fcf38c9aa9b45ba"
;;
esac

Expand Down
24 changes: 12 additions & 12 deletions srcpkgs/rust/template
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Template file for 'rust'
pkgname=rust
version=1.28.0
revision=1
_rust_dist_version=1.27.2
_cargo_dist_version=0.29.0
revision=2
_rust_dist_version=1.28.0
_cargo_dist_version=0.30.0
# NB. if you push any(!) new version, don't forget to put a build
# output of musl to https://alpha.de.repo.voidlinux.org/distfiles/
wrksrc="rustc-${version}-src"
Expand All @@ -30,9 +30,9 @@ x86_64-musl)
https://alpha.de.repo.voidlinux.org/distfiles/rust-std-${_rust_dist_version}-x86_64-unknown-linux-musl.tar.xz
https://alpha.de.repo.voidlinux.org/distfiles/cargo-${_cargo_dist_version}-x86_64-unknown-linux-musl.tar.gz"
checksum+="
2da811f9a81f63a93d62cefe15f391efaff663438f2c364fd1a522ef576753f4
e18aea5529d434e0950a77c266c3230ea878e3f3ea8b4114ee5a081092f98037
d54f7b4c6e8af657e6173e9e0200130b2f297f365ed4c06a4e9029762d975836"
1c54d595b0a1f3e283e453ff142800b3fdfb20dc2e45ceb71317693d2a278362
17d52f198877228788f012acf7b3ccbcbf9240553d42502b6816a3431806d9e1
e9344cbf3db669383cb3492d12bcd42d9130665f577be9ad4d2028011c7b1fae"
;;
x86_64)
# extract from src/stage0.txt
Expand All @@ -41,9 +41,9 @@ x86_64)
https://static.rust-lang.org/dist/rust-std-${_rust_dist_version}-x86_64-unknown-linux-gnu.tar.gz
https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-x86_64-unknown-linux-gnu.tar.xz"
checksum+="
ec3efc17ddbe6625840957049e15ebae960f447c8e8feb7da40c28dd6adf655f
68984f2233853d3e9c7c56edd72a91b5822157f28fdb42023fb311af68f842dd
2e62f91aab9ea496209a060e7ec62f088f5081b568a28b88f3c8ea7073db9829"
008bb3d714544bc991594b29a98a154441914c4771007130361bbadfb54143d0
c5aed4c7ef362b5754526d26acaccdc9300942fd12e5cc67cc56fc89576a9dab
9524db722356307669c9068bb7df8dbd57e153717e62071b62560eb22ce2f3cd"
;;
i686)
# extract from src/stage0.txt
Expand All @@ -52,9 +52,9 @@ i686)
https://static.rust-lang.org/dist/rust-std-${_rust_dist_version}-i686-unknown-linux-gnu.tar.gz
https://static.rust-lang.org/dist/cargo-${_cargo_dist_version}-i686-unknown-linux-gnu.tar.xz"
checksum+="
a9ba9c97cf4818ab14966617390eadfc3dfd5221033f8f749aebd86c1d722ef9
0ac6356223f53ec5f21cea6a9e9e5cd2fee3d45916f831e1ca54853893ec0b73
2bc3468b9b470824bf366f7404ad36644ad4d5a41f1be29601fd6a138d3b72a5"
30fa399934c90024275a08aa8992e76e98e04f152fc65b8aad3ca1fe231db39e
fbf71c10787fa1cd4fbde0a1ef6805fa4978705c809959f48917bb7c5b5b6d61
4b828c263283241ad1c99f30e0b5d8554b6dac2737d09cfd466b4c15b0d7296a"
;;
esac

Expand Down