Fix build with latest clash

package.yaml

@@ -27,7 +27,7 @@ dependencies:
   - bytestring
   - mtl
   - transformers
-  - barbies ^>= 2.0.1
+  - barbies >= 2.0.1
   - barbies-th
   - containers
   - array
@@ -71,6 +71,7 @@ ghc-options:
   -fplugin GHC.TypeLits.KnownNat.Solver
   -fplugin GHC.TypeLits.Normalise
   -fplugin GHC.TypeLits.Extra.Solver
+  -freduction-depth=1024
 
 source-dirs:
   - src

src/Hardware/Intel8080.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE PatternSynonyms #-}
 module Hardware.Intel8080 where
 
-import Clash.Prelude
+import Clash.Prelude hiding (And)
 import Clash.Annotations.BitRepresentation hiding (Value)
 
 type Reg = Index 8

src/Hardware/Intel8080/ALU.hs

@@ -2,7 +2,7 @@ module Hardware.Intel8080.ALU (binALU, shiftRotateALU) where
 
 import Prelude ()
 import Data.Word
-import Clash.Prelude
+import Clash.Prelude hiding (And)
 import Hardware.Intel8080
 
 nybbles :: Value -> (Unsigned 4, Unsigned 4)

src/Hardware/Intel8080/CPU.hs

@@ -19,6 +19,7 @@ import Control.Monad.State
 import Control.Monad.Trans.Maybe
 import Control.Monad.Except
 import Control.Lens hiding (Index)
+import Control.Monad (void, guard, when, unless)
 import Data.Maybe (fromMaybe, isJust)
 import Data.Wedge
 

src/Hardware/Intel8080/MicroCPU.hs

@@ -17,6 +17,7 @@ import Control.Monad.State
 import Control.Arrow ((&&&))
 import Control.Monad.Trans.Maybe
 import Control.Monad.Except
+import Control.Monad (unless, when)
 import Text.Printf
 
 data FlowControl

src/Hardware/Intel8080/Microcode.hs

@@ -106,6 +106,8 @@ pop2 =
 popPC :: MicroSteps True False
 popPC = pop2 >++> step INothing Jump INothing
 
+instance NFDataX (Wedge OutAddr InAddr)
+
 type MicroOp = (MicroInstr, Wedge OutAddr InAddr)
 type Setup = Maybe InAddr
 type MicroOps = [MicroOp]

src/Hardware/Intel8080/Model.hs

@@ -16,6 +16,7 @@ import Control.Monad.Trans.Maybe
 import Data.Foldable (traverse_)
 import Data.Bifoldable (bitraverse_)
 import Control.Monad.Extra (whenM, whileM)
+import Control.Monad (unless, when, void, (<=<))
 import Control.Lens hiding (index)
 import Data.Wedge
 

test/test-model.hs

@@ -18,7 +18,7 @@ import Data.Char (chr)
 import Test.Tasty (defaultMain, TestTree, testGroup)
 import Test.Tasty.Golden (goldenVsString, findByExtension)
 import System.FilePath ((<.>))
-import Data.ByteString.Lazy.Builder
+import Data.ByteString.Builder
 import Data.ByteString.Lazy (ByteString)
 
 run :: Bool -> IOArray Addr Value -> IO ByteString

test/test-sim.hs

@@ -23,7 +23,7 @@ import Test.Tasty (defaultMain, TestTree, testGroup)
 import Test.Tasty.Golden (goldenVsString, findByExtension)
 import Test.QuickCheck
 import System.FilePath ((<.>))
-import Data.ByteString.Lazy.Builder
+import Data.ByteString.Builder
 import Data.ByteString.Lazy (ByteString)
 
 run :: Bool -> IOArray Addr Value -> IO ByteString