kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-23 11:36:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(guix-1.5.0): make local-download patch compatible with default -p0 flow

Browse source
This commit is contained in:
vxtls 2026-03-13 08:34:33 -04:00
parent f786342a87
commit 85a0ff7c72
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
steps-guix/guix-1.5.0/pass1.sh
View file

@ -33,8 +33,6 @@ src_prepare() {
false false
fi fi
patch --dry-run -p1 < "${base_dir}/patches/allow-local-distfiles-in-perform-download.patch"
patch -p1 < "${base_dir}/patches/allow-local-distfiles-in-perform-download.patch"
sed \ sed \
-e "s|@EXEC_BASH_HASH@|${EXEC_BASH_HASH}|g" \ -e "s|@EXEC_BASH_HASH@|${EXEC_BASH_HASH}|g" \
-e "s|@EXEC_MKDIR_HASH@|${EXEC_MKDIR_HASH}|g" \ -e "s|@EXEC_MKDIR_HASH@|${EXEC_MKDIR_HASH}|g" \

4
steps-guix/guix-1.5.0/patches/allow-local-distfiles-in-perform-download.patch
View file

@ -1,5 +1,5 @@
--- a/guix/scripts/perform-download.scm --- guix-1.5.0/guix/scripts/perform-download.scm
+++ b/guix/scripts/perform-download.scm +++ guix-1.5.0/guix/scripts/perform-download.scm
@@ -97,16 +97,46 @@ a list of wrapper procedures for safely calling the list of procedures that @@ -97,16 +97,46 @@ a list of wrapper procedures for safely calling the list of procedures that
(call-with-port (open file (logior O_NOFOLLOW O_RDONLY)) (call-with-port (open file (logior O_NOFOLLOW O_RDONLY))
proc)) proc))