Enable more plugins for ghc 9.0

Author: fendor

cabal-ghc901.project

@@ -6,7 +6,7 @@ packages:
          ./ghcide
          ./hls-plugin-api
          ./hls-test-utils
-        --  ./plugins/hls-tactics-plugin
+        -- ./plugins/hls-tactics-plugin
         --  ./plugins/hls-brittany-plugin
         --  ./plugins/hls-stylish-haskell-plugin
         --  ./plugins/hls-fourmolu-plugin
@@ -18,7 +18,7 @@ packages:
          ./plugins/hls-rename-plugin
          ./plugins/hls-retrie-plugin
          ./plugins/hls-haddock-comments-plugin
-        --  ./plugins/hls-splice-plugin
+         ./plugins/hls-splice-plugin
          ./plugins/hls-floskell-plugin
          ./plugins/hls-pragmas-plugin
          ./plugins/hls-module-name-plugin
@@ -30,25 +30,12 @@ package *
   ghc-options: -haddock
   test-show-details: direct
 
-source-repository-package
-  type: git
-  location: https://github.com/jwaldmann/blaze-textual.git
-  tag: d8ee6cf80e27f9619d621c936bb4bda4b99a183f
-  -- https://github.com/jwaldmann/blaze-textual/commit/d8ee6cf80e27f9619d621c936bb4bda4b99a183f
-  -- https://github.com/bos/blaze-textual/issues/13
-
 source-repository-package
   type: git
   location: https://github.com/mithrandi/czipwith.git
   tag: b6245884ae83e00dd2b5261762549b37390179f8
   -- https://github.com/lspitzner/czipwith/pull/2
 
--- Head of hie-bios
-source-repository-package
-  type: git
-  location: https://github.com/mpickering/hie-bios
-  tag: 1875bff093983a0506f80e214eda27e7419da3bc
-
 -- Head of hiedb
 source-repository-package
   type: git
@@ -77,11 +64,11 @@ source-repository-package
 
 write-ghc-environment-files: never
 
-index-state: 2021-08-08T02:21:16Z
+index-state: 2021-08-31T02:21:16Z
 
 constraints:
     -- These plugins doesn't work on GHC9 yet
-    haskell-language-server -brittany -class -fourmolu -splice -stylishhaskell -tactic -refineImports
+    haskell-language-server -brittany -class -fourmolu -stylishhaskell -tactic
 
 
 allow-newer:

cabal-ghc921.project

@@ -30,13 +30,6 @@ package *
   ghc-options: -haddock
   test-show-details: direct
 
-source-repository-package
-  type: git
-  location: https://github.com/jwaldmann/blaze-textual.git
-  tag: d8ee6cf80e27f9619d621c936bb4bda4b99a183f
-  -- https://github.com/jwaldmann/blaze-textual/commit/d8ee6cf80e27f9619d621c936bb4bda4b99a183f
-  -- https://github.com/bos/blaze-textual/issues/13
-
 source-repository-package
   type: git
   location: https://github.com/mithrandi/czipwith.git
@@ -63,12 +56,6 @@ source-repository-package
   subdir: dependent-sum-template
 -- https://github.com/obsidiansystems/dependent-sum/pull/59
 
--- Head of hie-bios
-source-repository-package
-  type: git
-  location: https://github.com/mpickering/hie-bios
-  tag: 1875bff093983a0506f80e214eda27e7419da3bc
-
 -- Head of hiedb
 source-repository-package
   type: git
@@ -84,7 +71,7 @@ source-repository-package
 
 write-ghc-environment-files: never
 
-index-state: 2021-08-17T02:21:16Z
+index-state: 2021-08-31T02:21:16Z
 
 constraints:
     -- These plugins doesn't work on GHC9 yet

cabal.project

@@ -33,7 +33,7 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2021-08-12T12:00:38Z
+index-state: 2021-08-31T12:00:38Z
 
 constraints:
     hyphenation +embed

ghcide/src/Control/Concurrent/Strict.hs

@@ -4,7 +4,8 @@ module Control.Concurrent.Strict
     ,module Control.Concurrent.Extra
     ) where
 
-import           Control.Concurrent.Extra hiding (modifyVar, modifyVar_)
+import           Control.Concurrent.Extra hiding (modifyVar, modifyVar',
+                                           modifyVar_)
 import qualified Control.Concurrent.Extra as Extra
 import           Control.Exception        (evaluate)
 import           Control.Monad            (void)