diff --git a/nix/ops/default.nix b/nix/ops/default.nix index 7c15fb176..7412ecb58 100644 --- a/nix/ops/default.nix +++ b/nix/ops/default.nix @@ -10,6 +10,13 @@ let bootbrass = ../../bin/brass.pill; bootsolid = ../../bin/solid.pill; + rawzod = import ./fakeship { + inherit pkgs tlon deps debug; + pill = bootsolid; + ship = "zod"; + arvo = null; + }; + zod = import ./fakeship { inherit pkgs tlon deps arvo debug; pill = bootsolid; @@ -33,7 +40,7 @@ rec { solid = import ./solid { inherit arvo pkgs tlon deps debug; - pier = zod; + pier = rawzod; }; brass = import ./brass { diff --git a/nix/ops/fakeship/builder.sh b/nix/ops/fakeship/builder.sh index f7603170a..94736ad0f 100755 --- a/nix/ops/fakeship/builder.sh +++ b/nix/ops/fakeship/builder.sh @@ -2,7 +2,12 @@ source $stdenv/setup set -ex -$URBIT -d -F $SHIP -A "$ARVO" -B "$PILL" $out +if [ -z "$ARVO" ] +then + $URBIT -d -F $SHIP -B "$PILL" $out +else + $URBIT -d -F $SHIP -A "$ARVO" -B "$PILL" $out +fi check () { [ 3 -eq "$(herb $out -d 3)" ] diff --git a/nix/ops/solid/builder.sh b/nix/ops/solid/builder.sh index 943d4f2b6..16451b123 100755 --- a/nix/ops/solid/builder.sh +++ b/nix/ops/solid/builder.sh @@ -15,7 +15,15 @@ cleanup () { trap cleanup EXIT -herb ./pier -P solid.pill -d '+solid, =dub &' +herb ./pier -p hood -d '+hood/merge %stage our %home' +herb ./pier -p hood -d "+hood/mount /=stage=" + +rm -r ./pier/stage +cp -r $ARVO ./pier/stage + +herb ./pier -p hood -d "+hood/commit %stage" + +herb ./pier -P solid.pill -d '+solid /=stage=/sys, =dub &' mv solid.pill $out