From 55de09d9095b8f14239b778bb1eda7cdde95d9f0 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Thu, 12 Dec 2024 22:53:10 -0500
Subject: add guix installer workflow

---
 scripts/build-installer | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

(limited to 'scripts/build-installer')

diff --git a/scripts/build-installer b/scripts/build-installer
index 10cd84c..1293315 100755
--- a/scripts/build-installer
+++ b/scripts/build-installer
@@ -1,28 +1,8 @@
 #!/bin/sh
+set -e -o pipefail
 retry="$(dirname $0)/guix-retry"
 repo="$(realpath "$(dirname $0)/..")"
-extra_args=""
-
-if [ ! -d /gnu/store ]; then
-# we are likely in a non guix system
-# just for building the installer
-# make sure to authorize the substitute
-# servers for nonguix and sakura
-guix archive --authorize < "$repo/files/keys/nonguix.pub"
-guix archive --authorize < "$repo/files/keys/sakura.pub"
-substitutes=$(
-(cat <<EOF
-https://substitutes.nonguix.org
-https://substitutes.freya.cat
-https://bordeaux.guix.gnu.org
-https://ci.guix.gnu.org
-EOF
-) | tr '\n' ' ')
-extra_args="--substitute-urls=\"$substitutes\""
-fi
-
-command="\"$retry\" guix time-machine -C \"$repo/channels.scm\" $extra_args -- system -L \"$repo/modules\" image -t iso9660 \"$repo/systems/installer.scm\""
+command="\"$retry\" guix system -L \"$repo/modules\" image -t iso9660 \"$repo/systems/installer.scm\""
 image=$(sh -c "$command")
-
 date="$(date -Iseconds)"
 cp $image "guix-installer-$date.iso"
-- 
cgit v1.2.3-freya