data-default 0.8 introduced a breaking change: it doesn't export Defa…

…ult from data-default-class anymore. As clash-prelude uses data-default-class, this leads to two incompatible versions of the Default class. We constrain data-default for now and later decide what all our packages should do.
clash-lang · Nov 14, 2024 · c081579 · c081579
1 parent e2e6f19
commit c081579
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/clash-protocols-base/clash-protocols-base.cabal b/clash-protocols-base/clash-protocols-base.cabal
@@ -102,7 +102,6 @@ library
 
   build-depends:
     , circuit-notation
-    , data-default-class
     , deepseq
     , extra
     , ghc >= 8.7 && < 9.7

diff --git a/clash-protocols/clash-protocols.cabal b/clash-protocols/clash-protocols.cabal
@@ -116,7 +116,7 @@ library
     , clash-protocols-base
     , circuit-notation
     , clash-prelude-hedgehog
-    , data-default-class
+    , data-default ^>= 0.7.1.1
     , deepseq
     , extra
     , ghc >= 8.7 && < 9.7

diff --git a/clash-protocols/src/Protocols.hs b/clash-protocols/src/Protocols.hs
@@ -63,6 +63,6 @@ module Protocols (
   TaggedBundle (..),
 ) where
 
-import Data.Default.Class (def)
+import Data.Default (def)
 import Protocols.Df (Df)
 import Protocols.Internal
diff --git a/clash-protocols/src/Protocols/Df.hs b/clash-protocols/src/Protocols/Df.hs
@@ -1094,7 +1094,7 @@ For a generalized version of 'simulate', check out 'Protocols.simulateC'.
 simulate ::
   forall dom a b.
   (C.KnownDomain dom) =>
-  -- | Simulation configuration. Use 'Data.Default.Class.def' for sensible defaults.
+  -- | Simulation configuration. Use 'Data.Default.def' for sensible defaults.
   SimulationConfig ->
   -- | Circuit to simulate.
   ( C.Clock dom ->

diff --git a/clash-protocols/src/Protocols/DfConv.hs b/clash-protocols/src/Protocols/DfConv.hs
@@ -1511,7 +1511,7 @@ simulate ::
   ) =>
   Proxy dfA ->
   Proxy dfB ->
-  -- | Simulation configuration. Use 'Data.Default.Class.def' for sensible defaults.
+  -- | Simulation configuration. Use 'Data.Default.def' for sensible defaults.
   SimulationConfig ->
   -- | Circuit to simulate.
   ( Clock (Dom dfA) ->

diff --git a/clash-protocols/src/Protocols/Internal.hs b/clash-protocols/src/Protocols/Internal.hs
@@ -40,7 +40,7 @@ import Protocols.Plugin.Units
 
 import Control.Arrow ((***))
 import Data.Coerce (coerce)
-import Data.Default.Class (Default (def))
+import Data.Default (Default (def))
 import Data.Functor.Identity (Identity (..), runIdentity)
 import Data.Kind (Type)
 import Data.Tuple (swap)