diff options
| author | Carl Dong <contact@carldong.me> | 2021-07-14 23:00:58 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2021-07-15 21:50:48 -0400 |
| commit | e6a94d44469f90f4dc88a07a5a8587730811c705 (patch) | |
| tree | fde6f182e92f6b063403224260db4e7e68651c8a | |
| parent | 90fd13b954a364963f58e6cd12962c6f1986f79b (diff) | |
| download | bitcoin-e6a94d44469f90f4dc88a07a5a8587730811c705.tar.xz | |
guix: Bump to version-1.3.0 from upstream
The chosen commit is the HEAD of Guix's version-1.3.0 branch as of July
15th, 2021.
Also fix visual indenting.
| -rwxr-xr-x | contrib/guix/guix-build | 4 | ||||
| -rwxr-xr-x | contrib/guix/guix-codesign | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index 29d6701b25..533970872c 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -215,8 +215,8 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git log --format=%at -1)}" # across time. time-machine() { # shellcheck disable=SC2086 - guix time-machine --url=https://github.com/dongcarl/guix.git \ - --commit=490e39ff303f4f6873a04bfb8253755bdae1b29c \ + guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \ + --commit=aa34d4d28dfe25ba47d5800d05000fb7221788c0 \ --cores="$JOBS" \ --keep-failed \ --fallback \ diff --git a/contrib/guix/guix-codesign b/contrib/guix/guix-codesign index 62853dbf4d..11610a92e1 100755 --- a/contrib/guix/guix-codesign +++ b/contrib/guix/guix-codesign @@ -226,14 +226,14 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git log --format=%at -1)}" # across time. time-machine() { # shellcheck disable=SC2086 - guix time-machine --url=https://github.com/dongcarl/guix.git \ - --commit=490e39ff303f4f6873a04bfb8253755bdae1b29c \ - --cores="$JOBS" \ - --keep-failed \ - --fallback \ - ${SUBSTITUTE_URLS:+--substitute-urls="$SUBSTITUTE_URLS"} \ - ${ADDITIONAL_GUIX_COMMON_FLAGS} ${ADDITIONAL_GUIX_TIMEMACHINE_FLAGS} \ - -- "$@" + guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \ + --commit=aa34d4d28dfe25ba47d5800d05000fb7221788c0 \ + --cores="$JOBS" \ + --keep-failed \ + --fallback \ + ${SUBSTITUTE_URLS:+--substitute-urls="$SUBSTITUTE_URLS"} \ + ${ADDITIONAL_GUIX_COMMON_FLAGS} ${ADDITIONAL_GUIX_TIMEMACHINE_FLAGS} \ + -- "$@" } # Make sure an output directory exists for our builds |