diff options
| author | fanquake <fanquake@gmail.com> | 2022-01-12 19:44:53 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-01-12 19:46:14 +0800 |
| commit | 318c79e8096ce477561ef099835954b95a687685 (patch) | |
| tree | 38288151e54f77f57ffc2a3298658755ae77056c | |
| parent | 1f7acfdcca3525edf3eba23535240d23ff0c4fc9 (diff) | |
| parent | a229451590b2e5ef3c8a22c17f9656d1fb86ae7f (diff) | |
| download | bitcoin-318c79e8096ce477561ef099835954b95a687685.tar.xz | |
Merge bitcoin/bitcoin#24042: build: Point Guix to the current top of the "version-1.4.0" branch
a229451590b2e5ef3c8a22c17f9656d1fb86ae7f build: Point Guix to the current top of the "version-1.4.0" branch (Hennadii Stepanov)
Pull request description:
On master (c561f2f06ed25f08f7776ac41aeb2999ebe79550) the commit in Guix repo from bitcoin/bitcoin#23778 seems unavailable:
```
$ git checkout fa17abf1af09570708daa28dd40ffbc932ebe25c
fatal: reference is not a tree: fa17abf1af09570708daa28dd40ffbc932ebe25c
```
This PR points Guix to the current top of the "version-1.4.0" branch.
Fixes #24040.
ACKs for top commit:
MarcoFalke:
Approach ACK a229451590b2e5ef3c8a22c17f9656d1fb86ae7f
fanquake:
ACK a229451590b2e5ef3c8a22c17f9656d1fb86ae7f - from what I've seen on the mailing list there shouldn't be any more force pushing.
Tree-SHA512: c58f846fb0afd51b5c2dd33034e9d593aec5d5b49e9f2232af70ae1224da8408ad4e05aa314609350d92a6400e354a816b988226e3572198c3f839ab33913164
| -rwxr-xr-x | contrib/guix/guix-build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index 694f2ff1fa..98381f3e24 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -239,7 +239,7 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git -c log.showSignature=false log --f time-machine() { # shellcheck disable=SC2086 guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \ - --commit=fa17abf1af09570708daa28dd40ffbc932ebe25c \ + --commit=6ba510d76d6847065be725e958718002f3b13c7a \ --cores="$JOBS" \ --keep-failed \ --fallback \ |