diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index 1f0f56b62ce5..ac5a54468f42 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -1,24 +1,24 @@ # Run update.sh to update to the latest nightly -PORTVERSION= 1.98.0.${NIGHTLY_DATE:C,-,,g} +PORTVERSION= 1.99.0.${NIGHTLY_DATE:C,-,,g} # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust PORTREVISION= 0 PKGNAMESUFFIX= -nightly DISTNAME= rustc-nightly-src ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= upstream does not provide bootstraps for other architectures CONFLICTS_INSTALL= rust rust188 MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo -NIGHTLY_DATE= 2026-06-21 -BOOTSTRAPS_DATE= 2026-05-31 +NIGHTLY_DATE= 2026-07-27 +BOOTSTRAPS_DATE= 2026-07-13 RUST_BOOTSTRAP_VERSION= beta post-extract: @${FIND} -d ${WRKSRC} -name .github -exec ${RM} -r {} \; .include "${MASTERDIR}/Makefile" diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index ac2fe42586c6..b020c95c1a72 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1782132215 -SHA256 (rust/2026-06-21/rustc-nightly-src.tar.xz) = 9b9ab2241a305d9dd6c04388056b217fe02a99cfb5ae02da18d21bb7c63de9af -SIZE (rust/2026-06-21/rustc-nightly-src.tar.xz) = 243796628 -SHA256 (rust/2026-05-31/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 0dccc47a20e0a19542991f09413c8be3340bb763b866861f84450d48e14cd4f3 -SIZE (rust/2026-05-31/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 93178540 -SHA256 (rust/2026-05-31/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 77b21d734a10feeaf5d42e864079c3623e30027f22cd60a324856479c47e44e3 -SIZE (rust/2026-05-31/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 29311848 -SHA256 (rust/2026-05-31/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 7a105782f5152c52b8e7e9dd57e2c65b762b851c4b69486eb2cffe5d3eaa25a3 -SIZE (rust/2026-05-31/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 11733572 +TIMESTAMP = 1785187682 +SHA256 (rust/2026-07-27/rustc-nightly-src.tar.xz) = 02a8204c45c94a6fb5461eff72349efab8ef4ea24c1e537bd4ce8ab1c90ffef1 +SIZE (rust/2026-07-27/rustc-nightly-src.tar.xz) = 249109268 +SHA256 (rust/2026-07-13/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 39401f34485bb59935950d76020212d2d62f18242b87b78faf1af970e1979a2f +SIZE (rust/2026-07-13/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 101573788 +SHA256 (rust/2026-07-13/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 95e2f6b7ba8bf2ff9a47b7c28a4b93d818cf922a2dc6a8e670c269a0e789bca5 +SIZE (rust/2026-07-13/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 30654844 +SHA256 (rust/2026-07-13/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 7ef69cc255720e0cd64449d5377143f8e22a89b5ab2efef0c22435f35f4e5506 +SIZE (rust/2026-07-13/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 12029656 diff --git a/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs b/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs index bb97fdf79bd9..d0b60fae6b20 100644 --- a/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs +++ b/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs @@ -1,35 +1,35 @@ We run cargo update during USES=cargo ports builds to update specific crates and patch Cargo.lock for us. For normal crates this is based on what's available in the vendor dir. For Git sources this pulls new changes from the net instead even if we replace the source with a static path in a patch section in the config file. Add a hack to skip this. This is for experimentation to solve [1]. For this to maybe be useful for USES=cargo, the patch-in-config feature also needs to be stabilized first. It will be available in Rust 1.56. [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256581 ---- src/tools/cargo/src/cargo/sources/git/source.rs.orig 2026-04-11 13:43:17 UTC -+++ src/tools/cargo/src/cargo/sources/git/source.rs +--- src/tools/cargo/src/sources/git/source.rs.orig 2026-04-11 13:43:17 UTC ++++ src/tools/cargo/src/sources/git/source.rs @@ -254,6 +254,10 @@ impl<'gctx> GitSource<'gctx> { return Ok(()); } + if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() { + return Ok(()); + } + let git_fs = self.gctx.git_path(); // Ignore errors creating it, in case this is a read-only filesystem: // perhaps the later operations can succeed anyhow. @@ -393,6 +397,9 @@ impl<'gctx> Source for GitSource<'gctx> { kind: QueryKind, f: &mut dyn FnMut(IndexSummary), ) -> CargoResult<()> { + if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() { + return Ok(()) + } if self.path_source.borrow().is_none() { self.update()?; }