fix build for 8.10 (#3)

mpickering · May 9, 2020 · 755ecf2 · 755ecf2
1 parent ba159f1
commit 755ecf2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/cabal.project b/cabal.project
@@ -4,3 +4,5 @@ source-repository-package
     type: git
     location: https://github.com/mpickering/shake
     tag: 4d56fe9f09bd3bd63ead541c571c756995da490a
+
+allow-newer: ghc, base
diff --git a/src/Development/IDE/GHC/Compat.hs b/src/Development/IDE/GHC/Compat.hs
@@ -293,9 +293,5 @@ getModuleHash = mi_mod_hash
 
 
 getPackageName :: DynFlags -> Module.InstalledUnitId -> Maybe PackageName
-#if MIN_GHC_API_VERSION(8,10,0)
-getPackageName dfs i = getPackageName <$> lookupPackage dfs (DefUnitId i)
-#else
 getPackageName dfs i = packageName <$> lookupPackage dfs (Module.DefiniteUnitId (Module.DefUnitId i))
-#endif
 
diff --git a/src/Development/IDE/GHC/Orphans.hs b/src/Development/IDE/GHC/Orphans.hs
@@ -2,6 +2,7 @@
 -- SPDX-License-Identifier: Apache-2.0
 
 {-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 
 -- | Orphan instances for GHC.
@@ -52,8 +53,10 @@ instance Show ParsedModule where
 instance NFData ModSummary where
     rnf = rwhnf
 
+#if __GLASGOW_HASKELL__ < 810
 instance NFData FastString where
     rnf = rwhnf
+#endif
 
 instance NFData ParsedModule where
     rnf = rwhnf