From 8bb3da99614262370e57d5f69a4fe4bd951bc31c Mon Sep 17 00:00:00 2001
From: vxtls <187420201+vxtls@users.noreply.github.com>
Date: Thu, 19 Mar 2026 19:12:11 -0400
Subject: [PATCH] refactor(guix-1.5.0): [not tested]split seed prep into
 improve step and move build script to pass2

---
 steps-guix/guix-1.5.0/{pass1.sh => pass2.sh} | 4 ----
 steps-guix/manifest                          | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)
 rename steps-guix/guix-1.5.0/{pass1.sh => pass2.sh} (97%)

diff --git a/steps-guix/guix-1.5.0/pass1.sh b/steps-guix/guix-1.5.0/pass2.sh
similarity index 97%
rename from steps-guix/guix-1.5.0/pass1.sh
rename to steps-guix/guix-1.5.0/pass2.sh
index a38b3bdf..f768cf76 100755
--- a/steps-guix/guix-1.5.0/pass1.sh
+++ b/steps-guix/guix-1.5.0/pass2.sh
@@ -8,10 +8,6 @@ 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 3bc1d9ae..7248730f 100644
--- a/steps-guix/manifest
+++ b/steps-guix/manifest
@@ -69,6 +69,7 @@ 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
 build: loopback-bind-127001
 improve: services