Re-add singletons-base

clash-lang · Aug 22, 2024 · 9d559ec · 9d559ec
1 parent cf82ab4
commit 9d559ec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/nix/overlay-ghc902.nix b/nix/overlay-ghc902.nix
@@ -17,6 +17,9 @@ in
 
   singletons = prev.callHackage "singletons" "3.0" { };
 
+  # Lower the version to match `singletons-th`.
+  singletons-base = prev.callHackage "singletons-base" "3.0" { };
+
   # The versions on nixpkgs are too new for GHC 9.0.2, which doesn't have
   # type level `Char` literals.
   singletons-th = prev.callHackage "singletons-th" "3.0" {

diff --git a/nix/overlay-ghc962.nix b/nix/overlay-ghc962.nix
@@ -28,6 +28,10 @@ in
   # than the defaults in nixpkgs.
   rewrite-inspector = doJailbreak (markUnbroken prev.rewrite-inspector);
 
+  # We want a version that matches with singletons-th, but the tests in here
+  # are also a bit flaky since GHC 9.6 isn't officially supported.
+  singletons-base = dontCheck prev.singletons-base_3_2;
+
   # Use a newer version than the default in nixpkgs.
   singletons-th = prev.singletons-th_3_2;
 

diff --git a/tests/clash-testsuite.cabal b/tests/clash-testsuite.cabal
@@ -149,6 +149,7 @@ executable clash-testsuite
   if impl(ghc >= 9.0.0)
     build-depends:
       singletons,
+      singletons-base,
       singletons-th
   else
     build-depends: