Skip to content

Commit 39a4877

Browse files
committed
[hermes] Roll prebuilts
gherrit-pr-id: Gliiuhmmjpxnlhekzzccdf2jteq6louuw
1 parent 1c20e84 commit 39a4877

6 files changed

Lines changed: 17 additions & 15 deletions

File tree

tools/hermes/Cargo.toml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ similar = "2.7.0"
7575
#
7676
# FIXME: Add a CI step to verify that this commit exists and matches the
7777
# toolchain version.
78-
aeneas_rev = "5918d4719139b5e5ae6e7b63f584b036620b41b7"
78+
aeneas_rev = "1180be60c7a0e642cb442bfe90fe5cd8c1bb853f"
7979

8080
# The Lean toolchain version to use. This must match the version of Lean used
8181
# by Aeneas in the `lean-toolchain` file in the commit above.
@@ -94,27 +94,31 @@ lean_toolchain = "leanprover/lean4:v4.28.0-rc1"
9494
# version/commit ID once that's supported
9595
charon_version = "0.1.174"
9696

97+
# The Rust toolchain required by Charon.
98+
#
99+
# FIXME(#3165):
100+
# - Roll this from `tools/roll-pinned-prebuilts.py`
101+
# - Auto-install via `rustup` during `cargo hermes setup`
102+
charon_rust_toolchain = "nightly-2026-02-07"
103+
97104
[package.metadata.hermes.dependencies.aeneas]
98105
# The per-commit release tag from AeneasVerif/charon
99-
tag = "build-2026.03.24.085418-5918d4719139b5e5ae6e7b63f584b036620b41b7"
106+
tag = "build-2026.03.29.102514-1180be60c7a0e642cb442bfe90fe5cd8c1bb853f"
100107

101108
[package.metadata.hermes.dependencies.aeneas.checksums]
102-
linux-x86_64 = "fd706bf0f39701953d9d8734e9b0a9b8a6c9e71111006d093516748974a0d09a"
103-
linux-x86_64-aeneas = "1ed68728e18299ba961bc76c0c4897e582fdcfe30ec9b01919e250dc3cb6e65d"
109+
linux-x86_64 = "8224c76225329c8852e5a8cacf21fee9dc8bf93141a2a9a6ee2a52e3cfc2213f"
110+
linux-x86_64-aeneas = "0efc2c1c2f695e8e8fc268e6d3aaa20b7bf0a52790250f6ac45dd5f261d52a82"
104111
linux-x86_64-charon = "bcdc1ef536f863f21367973bd639e5557d36872cd9135d4b13ff84c2bc6df836"
105112
linux-x86_64-charon-driver = "20379b2051dd51dbea8d720e4041d55afe9241b95ab911e3b06492110450ecd0"
106-
macos-aarch64 = "d8284bf025cb768aa24cf49bdb66d6723f3c266d9ac95870bd5099d7db677e64"
107-
macos-aarch64-aeneas = "85f9bbda808c764095fae086e35214e485f40e4c9666f6b84916481e5c7263f8"
113+
macos-aarch64 = "7a5e9ded37dd21b288dffc68686ea4d254864c7a6b58a49d0bddab44d721114e"
114+
macos-aarch64-aeneas = "079a6565a1b5ec142548e50cc32db25ce05ae9ee97ee7148da2cb80d7286bd4e"
108115
macos-aarch64-charon = "6510ace82180cd78875b0631638a200d8e55bc9090c9372ea1dc8eb08511b6fb"
109116
macos-aarch64-charon-driver = "3c11fcb6c5cd65cd14d9747c7f8ddd1522b608a1e79041c907cb79d3118054b2"
110-
macos-x86_64 = "72ab5f3a22f7e666acd4c954600f4d963e34e22b900f222ce26b267939a0b4d2"
111-
macos-x86_64-aeneas = "72a9078abeb9c989f07da25a7f541f01e0ad62214a9475e27d24cf58ebd8a740"
117+
macos-x86_64 = "a909c3aa7813dd5f32b481d0c96e2b5ea3a729fa1898470b993055e778576459"
118+
macos-x86_64-aeneas = "7a001aa2b9f786a3978a25a68291dd0f56c0c4f069b59b782f7fb84ab206a49e"
112119
macos-x86_64-charon = "926c5ff8495c19b7a6f3aff1a3861970bae11bd374cf114ac3924a27bcae9ee7"
113120
macos-x86_64-charon-driver = "03e6617fe122f29111bf16538a5ba8f0beac6698ce473d99069439d30fa552e8"
114121

115-
[package.metadata.hermes.dependencies.charon]
116-
rust_toolchain = "nightly-2025-01-26"
117-
118122
[[test]]
119123
name = "integration"
120124
harness = false

tools/hermes/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ fn main() {
2929
("aeneas_rev", "HERMES_AENEAS_REV"),
3030
("lean_toolchain", "HERMES_LEAN_TOOLCHAIN"),
3131
("charon_version", "HERMES_CHARON_EXPECTED_VERSION"),
32+
("charon_rust_toolchain", "HERMES_CHARON_RUST_TOOLCHAIN"),
3233
];
3334

3435
for (key, env_var) in vars {

tools/hermes/src/charon.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,7 @@ fn check_charon_version(toolchain: &crate::setup::Toolchain) -> Result<()> {
288288
/// installed via rustup. If it is missing, we provide a helpful error message
289289
/// with the installation command.
290290
fn check_rustup_toolchain() -> Result<()> {
291-
// FIXME: We should probably parse this from Charon's metadata or a central
292-
// place. For now, it's pinned to a specific nightly in Charon's build.
293-
// In the future, Hermes could also manage the rustup toolchain.
294-
let nightly_version = "nightly-2025-01-26";
291+
let nightly_version = env!("HERMES_CHARON_RUST_TOOLCHAIN");
295292

296293
let output = Command::new("rustup")
297294
.args(["toolchain", "list"])
16.5 KB
Binary file not shown.
19.8 KB
Binary file not shown.
14.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)