Skip to content

Commit e605088

Browse files
committed
guix: Pin Guix using guix time-machine
1 parent ceb789c commit e605088

File tree

1 file changed

+19
-13
lines changed

1 file changed

+19
-13
lines changed

contrib/guix/guix-build.sh

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ make -C "${PWD}/depends" -j"$MAX_JOBS" download ${V:+V=1} ${SOURCES_PATH:+SOURCE
1313
# Determine the reference time used for determinism (overridable by environment)
1414
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git log --format=%at -1)}"
1515

16+
time-machine() {
17+
guix time-machine --url=https://github.com/dongcarl/guix.git \
18+
--commit=b3a7c72c8b2425f8ddb0fc6e3b1caeed40f86dee \
19+
-- "$@"
20+
}
21+
1622
# Deterministically build Bitcoin Core for HOSTs (overriable by environment)
1723
for host in ${HOSTS=i686-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu}; do
1824

@@ -22,18 +28,18 @@ for host in ${HOSTS=i686-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-
2228
# Run the build script 'contrib/guix/libexec/build.sh' in the build
2329
# container specified by 'contrib/guix/manifest.scm'
2430
# shellcheck disable=SC2086
25-
guix environment --manifest="${PWD}/contrib/guix/manifest.scm" \
26-
--container \
27-
--pure \
28-
--no-cwd \
29-
--share="$PWD"=/bitcoin \
30-
${SOURCES_PATH:+--share="$SOURCES_PATH"} \
31-
${ADDITIONAL_GUIX_ENVIRONMENT_FLAGS} \
32-
-- env HOST="$host" \
33-
MAX_JOBS="$MAX_JOBS" \
34-
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:?unable to determine value}" \
35-
${V:+V=1} \
36-
${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"} \
37-
bash -c "cd /bitcoin && bash contrib/guix/libexec/build.sh"
31+
time-machine environment --manifest="${PWD}/contrib/guix/manifest.scm" \
32+
--container \
33+
--pure \
34+
--no-cwd \
35+
--share="$PWD"=/bitcoin \
36+
${SOURCES_PATH:+--share="$SOURCES_PATH"} \
37+
${ADDITIONAL_GUIX_ENVIRONMENT_FLAGS} \
38+
-- env HOST="$host" \
39+
MAX_JOBS="$MAX_JOBS" \
40+
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:?unable to determine value}" \
41+
${V:+V=1} \
42+
${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"} \
43+
bash -c "cd /bitcoin && bash contrib/guix/libexec/build.sh"
3844

3945
done

0 commit comments

Comments
 (0)