From 83dd7384c6b4225185c67231d341a82f1f849d92 Mon Sep 17 00:00:00 2001
From: Joe Bryan <joemfb@gmail.com>
Date: Mon, 7 Dec 2020 16:22:55 -0800
Subject: [PATCH] aqua: build again (still broken)

---
 pkg/arvo/app/aqua.hoon | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkg/arvo/app/aqua.hoon b/pkg/arvo/app/aqua.hoon
index 3eec9a21df..c99dd7430e 100644
--- a/pkg/arvo/app/aqua.hoon
+++ b/pkg/arvo/app/aqua.hoon
@@ -27,24 +27,22 @@
 =>  $~  |%
     +$  versioned-state
       $%  state-0
-          state-1
       ==
     +$  state-0
       $:  %0
-          pil=pill
-          assembled=*
-          tym=@da
-          fleet-snaps=(map term (map ship pier))
-          piers=(map ship pier)
-      ==
-    +$  state-1
-      $:  %1
           pil=pill
           assembled=*
           tym=@da
           fleet-snaps=(map term fleet)
           piers=fleet
       ==
+    ::  XX temporarily shadowed, fix and remove
+    ::
+    +$  pill
+      $:  boot-ova=*
+          kernel-ova=(list unix-event)
+          userspace-ova=(list unix-event)
+      ==
     ::
     +$  fleet  [ships=(map ship pier) azi=az-state]
     +$  pier
@@ -55,7 +53,7 @@
       ==
     --
 ::
-=|  state-1
+=|  state-0
 =*  state  -
 =<
   %-  agent:dbug
@@ -79,13 +77,6 @@
     ::  wipe fleets and piers rather than give them falsely nulled azimuth state
     ::
         %0
-      %_  $
-        -.old            %1
-        fleet-snaps.old  *(map term fleet)
-        piers.old        *fleet
-      ==
-    ::
-        %1
       [cards this(state old)]
     ==
   ::