From 85a0ff7c72cd222a2ad3f887872445836df12b5d Mon Sep 17 00:00:00 2001 From: vxtls <187420201+vxtls@users.noreply.github.com> Date: Fri, 13 Mar 2026 08:34:33 -0400 Subject: [PATCH] fix(guix-1.5.0): make local-download patch compatible with default -p0 flow --- steps-guix/guix-1.5.0/pass1.sh | 2 -- .../patches/allow-local-distfiles-in-perform-download.patch | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/steps-guix/guix-1.5.0/pass1.sh b/steps-guix/guix-1.5.0/pass1.sh index b196e456..d564ed56 100755 --- a/steps-guix/guix-1.5.0/pass1.sh +++ b/steps-guix/guix-1.5.0/pass1.sh @@ -33,8 +33,6 @@ src_prepare() { false 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 \ -e "s|@EXEC_BASH_HASH@|${EXEC_BASH_HASH}|g" \ -e "s|@EXEC_MKDIR_HASH@|${EXEC_MKDIR_HASH}|g" \ diff --git a/steps-guix/guix-1.5.0/patches/allow-local-distfiles-in-perform-download.patch b/steps-guix/guix-1.5.0/patches/allow-local-distfiles-in-perform-download.patch index 56e57e52..b36f478b 100644 --- a/steps-guix/guix-1.5.0/patches/allow-local-distfiles-in-perform-download.patch +++ b/steps-guix/guix-1.5.0/patches/allow-local-distfiles-in-perform-download.patch @@ -1,5 +1,5 @@ ---- a/guix/scripts/perform-download.scm -+++ b/guix/scripts/perform-download.scm +--- guix-1.5.0/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 (call-with-port (open file (logior O_NOFOLLOW O_RDONLY)) proc))