Compat. with ghc 9.2

haskell · May 2, 2022 · 6a04ca5 · 6a04ca5
1 parent 55d94e9
commit 6a04ca5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/flags.yml b/.github/workflows/flags.yml
@@ -65,11 +65,7 @@ jobs:
         run: cabal v2-build hls-graph --flags="embed-files stm-stats"
 
       - name: Build `ghcide` with flags
-        run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe"
-
-      - if: matrix.ghc == '8.10.7'
-        name: Build `ghcide` with ekg
-        run: cabal v2-build ghcide --flags="ekg"
+        run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe ekg"
 
       # we have to clean up warnings for 9.0 and 9.2 before enable -WAll
       - if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.2'

diff --git a/cabal.project b/cabal.project
@@ -88,7 +88,9 @@ allow-newer:
 
   -- for ekg
   ekg-core:base,
+  ekg-core:ghc-prim,
   ekg-wai:base,
+  ekg-wai:time,
 
   -- for shake-bench
   Chart-diagrams:diagrams-core,