From 4abc97da82cc1f56621712e09c87719c5bcebacc Mon Sep 17 00:00:00 2001
From: vxtls <187420201+vxtls@users.noreply.github.com>
Date: Wed, 4 Mar 2026 21:58:54 -0500
Subject: [PATCH] fix(steps-guix): merge guix-1.5.0 improve stage into pass1
 build path

---
 steps-guix/guix-1.5.0/pass1.sh | 4 ++++
 steps-guix/manifest            | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/steps-guix/guix-1.5.0/pass1.sh b/steps-guix/guix-1.5.0/pass1.sh
index 419226c0..d7da6857 100755
--- a/steps-guix/guix-1.5.0/pass1.sh
+++ b/steps-guix/guix-1.5.0/pass1.sh
@@ -5,6 +5,10 @@ src_prepare() {
 
     default
 
+    # Merge improve:guix-1.5.0 into build:guix-1.5.0 so manifest order cannot
+    # accidentally influence pass number selection.
+    "${SRCDIR}/improve/guix-1.5.0.sh"
+
     if [ ! -f /tmp/guix-bootstrap-seeds.env ]; then
         echo "Missing /tmp/guix-bootstrap-seeds.env" >&2
         false
diff --git a/steps-guix/manifest b/steps-guix/manifest
index 9408b50d..77bf84b8 100644
--- a/steps-guix/manifest
+++ b/steps-guix/manifest
@@ -65,7 +65,6 @@ build: mes-minimal-stripped-0.19-i686-linux
 build: mescc-tools-static-stripped-0.5.2-i686-linux
 # End of Guix Bootstrap seeds
 build: guix-hash-compat-1.5.0
-improve: guix-1.5.0
 build: guix-1.5.0
 improve: guix-daemon-and-pull
 improve: guix-build-iso