Obtain the GHC libdir at runtime

ghcide.cabal

@@ -251,15 +251,14 @@ executable ghcide
         hashable,
         haskell-lsp,
         haskell-lsp-types,
-        hie-bios >= 0.5.0 && < 0.6,
+        hie-bios >= 0.6.0 && < 0.7,
         ghcide,
         optparse-applicative,
         safe-exceptions,
         shake,
         text,
         unordered-containers
     other-modules:
-        Utils
         Arguments
         Paths_ghcide
 

stack-ghc-lib.yaml

@@ -6,7 +6,7 @@ extra-deps:
 - haskell-lsp-types-0.22.0.0
 - lsp-test-0.11.0.2
 - extra-1.7.2
-- hie-bios-0.5.0
+- hie-bios-0.6.1
 - ghc-lib-parser-8.8.1
 - ghc-lib-8.8.1
 - fuzzy-0.1.0.0

stack.yaml

@@ -5,7 +5,7 @@ extra-deps:
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
 - lsp-test-0.11.0.2
-- hie-bios-0.5.0
+- hie-bios-0.6.1
 - fuzzy-0.1.0.0
 - regex-pcre-builtin-0.95.1.1.8.43
 - regex-base-0.94.0.0

stack810.yaml

@@ -7,7 +7,7 @@ extra-deps:
 - haskell-lsp-types-0.22.0.0
 - lsp-test-0.11.0.2
 - ghc-check-0.5.0.1
-- hie-bios-0.5.0
+- hie-bios-0.6.1
 
 # not yet in stackage
 - Chart-diagrams-1.9.3

stack84.yaml

@@ -11,7 +11,7 @@ extra-deps:
 - rope-utf16-splay-0.3.1.0
 - filepattern-0.1.1
 - js-dgtable-0.5.2
-- hie-bios-0.5.0
+- hie-bios-0.6.1
 - fuzzy-0.1.0.0
 - shake-0.18.5
 - time-compat-1.9.2.2

stack88.yaml

@@ -6,7 +6,7 @@ extra-deps:
 - haskell-lsp-types-0.22.0.0
 - lsp-test-0.11.0.2
 - ghc-check-0.5.0.1
-- hie-bios-0.5.0
+- hie-bios-0.6.1
 - extra-1.7.2
 nix:
   packages: [zlib]

test/exe/Main.hs

@@ -40,7 +40,8 @@ import Language.Haskell.LSP.VFS (applyChange)
 import Network.URI
 import System.Environment.Blank (getEnv, setEnv, unsetEnv)
 import System.FilePath
-import System.IO.Extra
+import System.IO.Extra hiding (withTempDir)
+import qualified System.IO.Extra
 import System.Directory
 import System.Exit (ExitCode(ExitSuccess))
 import System.Process.Extra (readCreateProcessWithExitCode, CreateProcess(cwd), proc)
@@ -1261,7 +1262,7 @@ addTypeAnnotationsToLiteralsTest = testGroup "add type annotations to literals t
                , ""
                , "import Debug.Trace"
                , ""
-               , "f a = traceShow \"debug\" a" 
+               , "f a = traceShow \"debug\" a"
                ])
     [ (DsWarning, (6, 6), "Defaulting the following constraint") ]
     "Add type annotation ‘[Char]’ to ‘\"debug\"’"
@@ -3001,3 +3002,11 @@ getWatchedFilesSubscriptionsUntil = do
             | Just RequestMessage{_params = RegistrationParams (List regs)} <- msgs
             , Registration _id WorkspaceDidChangeWatchedFiles args <- regs
             ]
+
+-- | Version of 'System.IO.Extra.withTempDir' that canonicalizes the path
+-- Which we need to do on macOS since the $TMPDIR can be in @/private/var@ or
+-- @/var@
+withTempDir :: (FilePath -> IO a) -> IO a
+withTempDir f = System.IO.Extra.withTempDir $ \dir -> do
+  dir' <- canonicalizePath dir
+  f dir'