X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FCompat.hs;h=f48faa90cc7c40031779a9679b44ddcbf16e41b1;hb=2477907622233c9462d919737955f9ad0d38a3aa;hp=ddf4a7893e9c4a635a007b91981e6077bfa6c86b;hpb=b9125dab0726c05597d9dd372e12f779906c5b5b;p=lsp-test.git diff --git a/src/Language/Haskell/LSP/Test/Compat.hs b/src/Language/Haskell/LSP/Test/Compat.hs index ddf4a78..f48faa9 100644 --- a/src/Language/Haskell/LSP/Test/Compat.hs +++ b/src/Language/Haskell/LSP/Test/Compat.hs @@ -9,9 +9,16 @@ import Data.Maybe import System.IO #if MIN_VERSION_process(1,6,3) +-- We have to hide cleanupProcess for process-1.6.3.0 +-- cause it is in the public api for 1.6.3.0 versions +-- shipped with ghc >= 8.6 and < 8.6.4 import System.Process hiding (getPid, cleanupProcess) +# if MIN_VERSION_process(1,6,4) import qualified System.Process (getPid, cleanupProcess) # else +import qualified System.Process (getPid) +# endif +#else import System.Process import System.Process.Internals import Control.Concurrent.MVar @@ -59,7 +66,7 @@ cleanupRunningProcess p@(_, _, _, ph) = getProcessExitCode ph >>= maybe (cleanupProcess p) (const $ return ()) cleanupProcess :: (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle) -> IO () -#if MIN_VERSION_process(1,6,3) +#if MIN_VERSION_process(1,6,4) cleanupProcess = System.Process.cleanupProcess #else cleanupProcess (mb_stdin, mb_stdout, mb_stderr, ph) = do