Skip to content

Commit

Permalink
Update guix commit: rust 1.82
Browse files Browse the repository at this point in the history
  • Loading branch information
edouardparis committed Dec 4, 2024
1 parent d2379bd commit e3acfa7
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions contrib/reproducible/guix/guix-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ maybe_create_dir "$BIN_DIR"

# That's what Guix comes with.
RUST_VERSION="1.60.0"
CARGO_BIN="$BIN_DIR/cargo"
CARGO_BIN="$(which cargo)"

# First off get the cargo binary to run on the host to vendor dependencies.
# We assume the host is a 64bit Linux system.
Expand All @@ -41,14 +41,16 @@ if ! [ -f "$CARGO_BIN" ]; then
echo "b8a4c3959367d053825e31f90a5eb86418eb0d80cacda52bfa80b078e18150d5 $ARCHIVE_PATH" | $SHASUM_BIN -c
# Path of the cargo binary within the archive
CARGO_BIN_PATH="rust-$RUST_VERSION-x86_64-unknown-linux-gnu/cargo/bin/cargo"
CARGO_BIN="$BIN/cargo"

( cd $BIN_DIR && tar -xzf $ARCHIVE_PATH $CARGO_BIN_PATH && mv $CARGO_BIN_PATH $CARGO_BIN )
fi

# Execute "$@" in a pinned, possibly older version of Guix, for reproducibility
# across time.
time_machine() {
guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \
--commit=3ef5e20bcdb6caed49e5db46a135ee4c17d69b5f \
--commit=1c4a00820a1ba6265d2d96f4f7804d0807d69dcc \
--cores="$JOBS" \
--keep-failed \
--fallback \
Expand Down

0 comments on commit e3acfa7

Please sign in to comment.