Correct version numbers for *-hedgehog packages (#2603)

clash-lang · Nov 9, 2023 · fe787fb · fe787fb
1 parent ec96cb7
commit fe787fb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/.ci/cabal.project.local b/.ci/cabal.project.local
@@ -10,7 +10,7 @@ package *
 
 package clash-prelude
   ghc-options: -Werror
-  flags: +doctests +multiple-hidden -workaround-ghc-mmap-crash
+  flags: +doctests -workaround-ghc-mmap-crash
   tests: True
   benchmarks: True
 
@@ -48,7 +48,7 @@ package clash-lib-hedgehog
 package clash-testsuite
   ghc-options: -Werror
   -- enable cosim
-  flags: +cosim +multiple-hidden -workaround-ghc-mmap-crash
+  flags: +cosim -workaround-ghc-mmap-crash
 
 package clash-benchmark
   ghc-options: -Werror

diff --git a/clash-lib-hedgehog/clash-lib-hedgehog.cabal b/clash-lib-hedgehog/clash-lib-hedgehog.cabal
@@ -1,7 +1,7 @@
 cabal-version:      2.2
 
 name:               clash-lib-hedgehog
-version:            1.9.0
+version:            1.8.0
 synopsis:           Hedgehog Generators for clash-lib
 description:        Hedgehog Generators for clash-lib
 bug-reports:        https://github.com/clash-lang/clash-compiler/issues

diff --git a/clash-prelude-hedgehog/clash-prelude-hedgehog.cabal b/clash-prelude-hedgehog/clash-prelude-hedgehog.cabal
@@ -1,7 +1,7 @@
 cabal-version:      2.2
 
 name:               clash-prelude-hedgehog
-version:            1.9.0
+version:            1.8.0
 synopsis:           Hedgehog Generators for clash-prelude
 description:        Hedgehog Generators for clash-prelude
 bug-reports:        https://github.com/clash-lang/clash-compiler/issues

diff --git a/clash-prelude/src/Clash/Prelude/BlockRam.hs b/clash-prelude/src/Clash/Prelude/BlockRam.hs
@@ -846,6 +846,13 @@ readNew (blockRam (0 :> 1 :> Nil))
      ... =>
      Signal dom addr -> Signal dom (Maybe (addr, a)) -> Signal dom a
 
+#elif __GLASGOW_HASKELL__ >= 906 && !defined(CLASH_MULTIPLE_HIDDEN)
+>>> :t readNew (blockRam (0 :> 1 :> Nil))
+readNew (blockRam (0 :> 1 :> Nil))
+  :: ...
+     ... =>
+     Signal dom addr -> Signal dom (Maybe (addr, a)) -> Signal dom a
+
 #else
 >>> :t readNew (blockRam (0 :> 1 :> Nil))
 readNew (blockRam (0 :> 1 :> Nil))

diff --git a/tests/clash-testsuite.cabal b/tests/clash-testsuite.cabal
@@ -28,7 +28,7 @@ flag multiple-hidden
     experimental feature, possibly triggering confusing error messages. By
     default, it is enabled on development versions of Clash and disabled on
     releases.
-  default: True
+  default: False
   manual: True
 
 flag workaround-ghc-mmap-crash