From 4ca6570ecda0a39fc056c239ada6c2368b4dd698 Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Mon, 10 Feb 2020 13:25:49 +0100 Subject: Fix patchBuildToolProgs when haddock cannot be found Cabal's GHC.configure doesn't demand haddock exist, so we have to handle the case where it's not installed. --- src/CabalHelper/Compiletime/Program/Stack.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/CabalHelper/Compiletime/Program/Stack.hs') diff --git a/src/CabalHelper/Compiletime/Program/Stack.hs b/src/CabalHelper/Compiletime/Program/Stack.hs index d057d65..dc0b0e5 100644 --- a/src/CabalHelper/Compiletime/Program/Stack.hs +++ b/src/CabalHelper/Compiletime/Program/Stack.hs @@ -85,7 +85,7 @@ paths qe@QueryEnv{qeProjLoc=ProjLocStackYaml stack_yaml} cwd workdirArg qe ++ [ "path", "--stack-yaml="++stack_yaml ] return $ \k -> let Just x = lookup k $ map split $ lines out in x where - split l = let (key, ' ' : val) = span (not . isSpace) l in (key, val) + split l = let (key, val) = break isSpace l in (key, dropWhile isSpace val) listPackageCabalFiles :: QueryEnvI c 'Stack -> IO [CabalFile] listPackageCabalFiles qe@QueryEnv{qeProjLoc} -- cgit v1.2.3