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