More Compat for GHC 9.2

Author: fendor

cabal-ghc921.project

@@ -15,7 +15,7 @@ packages:
          ./plugins/hls-explicit-imports-plugin
          ./plugins/hls-refine-imports-plugin
          ./plugins/hls-hlint-plugin
-         ./plugins/hls-retrie-plugin
+        -- ./plugins/hls-retrie-plugin
          ./plugins/hls-haddock-comments-plugin
         --  ./plugins/hls-splice-plugin
          ./plugins/hls-floskell-plugin
@@ -42,20 +42,6 @@ source-repository-package
   location: https://github.com/HeinrichApfelmus/operational
   tag: 16e19aaf34e286f3d27b3988c61040823ec66537
 
-source-repository-package
-  type: git
-  location: https://github.com/anka-213/th-extras
-  tag: 57a97b4df128eb7b360e8ab9c5759392de8d1659
--- https://github.com/mokus0/th-extras/pull/8
--- https://github.com/mokus0/th-extras/issues/7
-
-source-repository-package
-  type: git
-  location: https://github.com/fendor/dependent-sum
-  tag: 5de03c38b0de4945f4e9bce1b026110e69dc8118
-  subdir: dependent-sum-template
--- https://github.com/obsidiansystems/dependent-sum/pull/59
-
 -- Head of hiedb
 source-repository-package
   type: git
@@ -75,52 +61,215 @@ 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 -callhierarchy
+    haskell-language-server -brittany -class -fourmolu -splice -stylishhaskell -tactic -refineImports -callhierarchy -retrie
 
 
 allow-newer:
-    -- -- Broken on ghc9, but let's pretend it's not so we can build the other things
-    -- brittany:base,
-    -- brittany:ghc,
-    -- brittany:ghc-boot-th,
-    -- butcher:base,
-    -- fourmolu:ghc-lib-parser,
-    -- stylish-haskell:ghc-lib-parser,
-    -- stylish-haskell:Cabal,
-    -- multistate:base,
-    -- ghc-source-gen:ghc,
+  Cabal,
+  base,
+  binary,
+  bytestring,
+  ghc,
+  ghc-bignum,
+  ghc-prim,
+  integer-gmp,
+  template-haskell,
+  text,
+  time,
 
-    assoc:base,
-    cryptohash-md5:base,
-    cryptohash-sha1:base,
-    constraints-extras:template-haskell,
-    data-tree-print:base,
-    deepseq:base,
-    dependent-sum:some,
-    dependent-sum:constraints,
-    diagrams-postscript:base,
-    diagrams-postscript:lens,
-    diagrams-postscript:diagrams-core,
-    diagrams-postscript:monoid-extras,
-    diagrams:diagrams-core,
-    Chart-diagrams:diagrams-core,
-    SVGFonts:diagrams-core,
-    dual-tree:base,
-    -- Does this make any sense?
-    entropy:Cabal,
-    force-layout:base,
-    force-layout:lens,
-    floskell:ghc-prim,
-    floskell:base,
-    hashable:base,
-    hslogger:base,
-    monoid-extras:base,
-    newtype-generics:base,
-    parallel:base,
-    regex-base:base,
-    regex-tdfa:base,
-    statestack:base,
-    svg-builder:base,
-    these:base,
-    time-compat:base
+  diagrams-postscript:lens,
+  diagrams-postscript:diagrams-core,
+  diagrams-postscript:monoid-extras,
+  dependent-sum:some,
+  dependent-sum:constraints,
+  diagrams:diagrams-core,
+  Chart-diagrams:diagrams-core,
+  SVGFonts:diagrams-core
 
+constraints:
+  Agda ==2.6.1.3,
+  Diff ==0.4.0,
+  EdisonAPI ==1.3.1,
+  EdisonCore ==1.3.2.1,
+  FPretty ==1.1,
+  HTTP ==4000.3.16,
+  HUnit ==1.6.2.0,
+  QuickCheck ==2.14.2,
+  Spock-core ==0.14.0.0,
+  aeson ==1.5.6.0,
+  aivika ==5.9.1,
+  aivika-transformers ==5.9.1,
+  alex ==3.2.6,
+  ansi-pretty ==0.1.2.2,
+  arith-encode ==1.0.2,
+  async ==2.2.3,
+  async-pool ==0.9.1,
+  attoparsec ==0.13.2.5 || ==0.14.1,
+  barbies-th ==0.1.8,
+  base-compat ==0.11.2,
+  base-compat-batteries ==0.11.2,
+  base16-bytestring ==1.0.1.0,
+  basement ==0.0.12,
+  bits ==0.5.3,
+  blaze-builder ==0.4.2.1,
+  blaze-textual ==0.2.1.0,
+  boomerang ==1.4.7,
+  bound ==2.0.3,
+  box-tuples ==0.2.0.4,
+  byteslice ==0.2.5.2,
+  bytesmith ==0.3.7.0,
+  bytestring-strict-builder ==0.4.5.4,
+  cabal-doctest ==1.0.8,
+  cantor-pairing ==0.2.0.1,
+  cassava ==0.5.2.0,
+  cborg ==0.2.5.0,
+  cereal ==0.5.8.1,
+  charset ==0.3.8,
+  chaselev-deque ==0.5.0.5,
+  classy-prelude ==1.5.0,
+  combinat ==0.2.10.0,
+  commonmark-extensions ==0.2.1.2,
+  conduit ==1.3.4.1,
+  constraints ==0.13,
+  constraints-extras ==0.3.1.0,
+  cql ==4.0.3,
+  critbit ==0.2.0.0,
+  cryptonite ==0.29,
+  data-default-instances-new-base ==0.0.2,
+  data-dword ==0.3.2,
+  data-r-tree ==0.6.0,
+  datetime ==0.3.1,
+  deferred-folds ==0.9.17,
+  dependent-sum-template ==0.1.0.3,
+  deriving-compat ==0.5.10,
+  diagrams-lib ==1.4.4,
+  doctest ==0.18.1,
+  dom-lt ==0.2.2.1,
+  drinkery ==0.4,
+  edit-distance ==0.2.2.1,
+  emacs-module ==0.1.1,
+  endo ==0.3.0.1,
+  entropy ==0.4.1.6,
+  enumeration ==0.2.0,
+  extra ==1.7.9,
+  fgl ==5.7.0.3,
+  filepattern ==0.1.2,
+  focus ==1.0.2,
+  free-algebras ==0.1.0.1,
+  free-functors ==1.2.1,
+  generic-data ==0.9.2.0,
+  generic-deriving ==1.14,
+  generic-lens ==2.2.0.0,
+  generic-lens-core ==2.2.0.0,
+  generic-optics ==2.2.0.0,
+  generics-sop ==0.5.1.1,
+  geniplate-mirror ==0.7.8,
+  ghc-events ==0.17.0,
+  happy ==1.20.0,
+  hashtables ==1.2.4.1,
+  haskeline ==0.7.5.0,
+  haskell-src-exts ==1.23.1,
+  haskell-src-meta ==0.8.7,
+  haxl ==2.3.0.0,
+  heterocephalus ==1.0.5.4,
+  hgeometry ==0.12.0.4,
+  hgeometry-ipe ==0.12.0.0,
+  hscolour ==1.24.4,
+  hslogger ==1.3.1.0,
+  hspec-core ==2.8.3,
+  hspec-discover ==2.8.3,
+  hspec-expectations ==0.8.2,
+  hspec-meta ==2.7.8,
+  hspec-wai ==0.11.1,
+  http-types ==0.12.3,
+  http2 ==3.0.2,
+  hvect ==0.4.0.0,
+  hxt ==9.3.1.22,
+  inj-base ==0.2.0.0,
+  inspection-testing ==0.4.6.0,
+  invariant ==0.5.4,
+  io-choice ==0.0.7,
+  iproute ==1.7.11,
+  language-c ==0.9.0.1,
+  language-haskell-extract ==0.2.4,
+  language-javascript ==0.7.1.0,
+  lens ==5.0.1,
+  lens-family-th ==0.5.2.0,
+  list-t ==1.0.4,
+  lockfree-queue ==0.2.3.1,
+  memory ==0.16.0,
+  microlens-ghc ==0.4.13,
+  monad-validate ==1.2.0.0,
+  monadplus ==1.4.2,
+  mono-traversable ==1.0.15.1,
+  mono-traversable-keys ==0.1.0,
+  mustache ==2.3.1,
+  network ==3.1.2.2,
+  newtype-generics ==0.6,
+  obdd ==0.8.2,
+  optics-th ==0.4,
+  packman ==0.5.0,
+  pandoc ==2.14.2,
+  parameterized-utils ==2.1.3.0,
+  partial-isomorphisms ==0.2.2.1,
+  pem ==0.2.4,
+  persistent ==2.13.0.3 || ==2.13.1.1,
+  plots ==0.1.1.2,
+  pointed ==5.0.2,
+  posix-api ==0.3.5.0,
+  primitive-extras ==0.10.1.1,
+  primitive-sort ==0.1.0.0,
+  primitive-unlifted ==0.1.3.0,
+  proto3-wire ==1.2.2,
+  quickcheck-instances ==0.3.25.2,
+  random ==1.2.0,
+  relude ==1.0.0.1,
+  row-types ==1.0.1.0,
+  safe ==0.3.19,
+  safecopy ==0.10.4.2,
+  salak ==0.3.6,
+  securemem ==0.1.10,
+  semialign ==1.2,
+  semigroupoids ==5.3.5,
+  serialise ==0.2.3.0,
+  servant ==0.18.3,
+  shake ==0.19.5,
+  shakespeare ==2.0.25,
+  singletons ==3.0,
+  singletons-base ==3.0,
+  siphash ==1.0.3,
+  snap-core ==1.0.4.2,
+  streaming-commons ==0.2.2.1,
+  streamly ==0.8.0,
+  subcategories ==0.1.1.0,
+  test-framework ==0.8.2.0,
+  text-format ==0.3.2,
+  text-short ==0.1.3,
+  text-show ==3.9,
+  th-desugar ==1.12,
+  th-extras ==0.0.0.4,
+  threads ==0.5.1.6,
+  tls ==1.5.5,
+  tpdb ==2.2.0,
+  tree-diff ==0.2,
+  true-name ==0.1.0.3,
+  uniplate ==1.6.13,
+  unordered-containers ==0.2.14.0,
+  validity ==0.11.0.1,
+  vector-builder ==0.3.8.2,
+  vector-circular ==0.1.3,
+  vector-th-unbox ==0.2.1.9,
+  vinyl ==0.13.3,
+  vty ==5.33,
+  wai-app-static ==3.1.7.2,
+  wai-extra ==3.1.6,
+  wai-middleware-static ==0.9.0,
+  warp ==3.3.17,
+  winery ==1.3.2,
+  witherable ==0.4.1,
+  x509 ==1.7.5,
+  x509-validation ==1.6.11,
+  xlsx ==0.8.4,
+  xml-hamlet ==0.5.0.1,
+  yaml ==0.11.5.0,
+  yesod-core ==1.6.21.0

ghcide/ghcide.cabal

@@ -48,7 +48,7 @@ library
         dependent-map,
         dependent-sum,
         dlist,
-        extra >= 1.7.4,
+        extra >= 1.7.4 && < 1.7.10,
         fuzzy,
         filepath,
         fingertree,

ghcide/src/Control/Concurrent/Strict.hs

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

ghcide/src/Development/IDE/GHC/Compat.hs

@@ -95,27 +95,24 @@ import Development.IDE.GHC.Compat.Util
 #if MIN_VERSION_ghc(9,0,0)
 import           GHC.Data.StringBuffer
 import           GHC.Driver.Session    hiding (ExposePackage)
-#if !MIN_VERSION_ghc(9,2,0)
+#if MIN_VERSION_ghc(9,2,0)
+import           GHC.Driver.Env as Env
+import           GHC.Unit.Module.ModIface
+#else
 import           GHC.Driver.Types
 #endif
 import           GHC.Hs.Extension
+import           GHC.Iface.Env
 import           GHC.Iface.Make           (mkIfaceExports)
 import qualified GHC.SysTools.Tasks       as SysTools
 import           GHC.Tc.Utils.TcType      (pprSigmaType)
 import qualified GHC.Types.Avail          as Avail
 import qualified GHC.Unit.Module.Location as Module
+import           GHC.Unit.Types
 #else
 import           DynFlags               hiding (ExposePackage)
 import qualified Module
-#if MIN_VERSION_ghc(9,0,0)
-import           Control.Exception.Safe as Safe (Exception, MonadCatch, catch)
-import           GHC.Core.TyCo.Ppr      (pprSigmaType)
-import           GHC.Iface.Load
-import           GHC.Types.Unique.Set   (emptyUniqSet)
-#else
 import           TcType                 (pprSigmaType)
-#endif
-
 import           HscTypes
 import           MkIface hiding (writeIfaceFile)
 #if MIN_VERSION_ghc(8,10,0)
@@ -149,7 +146,7 @@ import           Data.IORef
 
 import qualified Data.Map               as Map
 
-#if MIN_VERSION_ghc(9,0,0) && !MIN_VERSION_ghc(9,2,0)
+#if MIN_VERSION_ghc(9,0,0)
 import qualified Data.Set               as S
 #endif
 #if MIN_VERSION_ghc(8,8,0)