kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-05-31 14:20:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(guix): use local repo path for self-source git-fetch

Browse source
This commit is contained in:
vxtls 2026-04-17 17:16:59 -04:00
parent bc9e3d1301
commit ce115e33a2
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
steps-guix/guix-1.5.0/patches/use-local-self-source.patch.in
View file

@ -6,7 +6,7 @@
(uri (git-reference (uri (git-reference
- (url "https://git.guix.gnu.org/guix.git") - (url "https://git.guix.gnu.org/guix.git")
- (commit commit))) - (commit commit)))
+ (url "@LOCAL_GUIX_CHECKOUT_URL@") + (url "@LOCAL_GUIX_CHECKOUT_PATH@")
+ (commit "@LOCAL_GUIX_CHECKOUT_COMMIT@"))) + (commit "@LOCAL_GUIX_CHECKOUT_COMMIT@")))
(sha256 (sha256
(base32 (base32

8
steps-guix/improve/guix-daemon-and-pull.sh
View file

@ -111,7 +111,7 @@ prepare_local_channel_checkout() {
channel_patch_link="" channel_patch_link=""
base_commit="" base_commit=""
base_hash="" base_hash=""
channel_url="" checkout_path=""
if [ ! -x "${guix_seed_helper}" ]; then if [ ! -x "${guix_seed_helper}" ]; then
echo "Missing Guix seed helper: ${guix_seed_helper}" >&2 echo "Missing Guix seed helper: ${guix_seed_helper}" >&2
@ -192,11 +192,13 @@ prepare_local_channel_checkout() {
git -c user.name='guix-local' -c user.email='guix-local@example.invalid' commit -q -m 'local guix channel base snapshot' git -c user.name='guix-local' -c user.email='guix-local@example.invalid' commit -q -m 'local guix channel base snapshot'
base_commit="$(git rev-parse HEAD)" base_commit="$(git rev-parse HEAD)"
channel_url="file://${channel_repo}" # 'git-fetch' accepts a local repository path here, but rejects
# 'file://' URLs through 'guix perform-download'.
checkout_path="${channel_repo}"
base_hash="$(hash_git_checkout_as_guix "${channel_repo}" "${base_commit}")" base_hash="$(hash_git_checkout_as_guix "${channel_repo}" "${base_commit}")"
sed \ sed \
-e "s|@LOCAL_GUIX_CHECKOUT_URL@|${channel_url}|g" \ -e "s|@LOCAL_GUIX_CHECKOUT_PATH@|${checkout_path}|g" \
-e "s|@LOCAL_GUIX_CHECKOUT_COMMIT@|${base_commit}|g" \ -e "s|@LOCAL_GUIX_CHECKOUT_COMMIT@|${base_commit}|g" \
-e "s|@LOCAL_GUIX_CHECKOUT_HASH@|${base_hash}|g" \ -e "s|@LOCAL_GUIX_CHECKOUT_HASH@|${base_hash}|g" \
"${self_source_patch_template}" > "${rendered_self_source_patch}" "${self_source_patch_template}" > "${rendered_self_source_patch}"