File tree Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -23,6 +23,7 @@ main = do
23
23
let name =
24
24
if | any ((" dist-newstyle" == ) . takeFileName) files -> " cabal"
25
25
| any ((" .stack-work" == ) . takeFileName) files -> " stack"
26
+ | any ((" cabal.project" == ) . takeFileName) files -> " cabal"
26
27
| any ((" stack.yaml" == ) . takeFileName) files -> " stack"
27
28
| otherwise -> " cabal"
28
29
cfs <- runMaybeT $ case name of
Original file line number Diff line number Diff line change @@ -37,7 +37,10 @@ instance FromJSON Pkgs where
37
37
stackYamlPkgs :: FilePath -> MaybeT IO [FilePath ]
38
38
stackYamlPkgs p = liftIO $
39
39
decodeFileEither (p </> " stack.yaml" ) >>= \ case
40
- Right (Pkgs f) -> pure f
40
+ Right (Pkgs f) ->
41
+ liftIO $
42
+ map (p </> )
43
+ <$> getDirectoryFiles p (map (</> " *.cabal" ) f)
41
44
Left e -> fail $ show e
42
45
43
46
cabalPkgs :: FilePath -> MaybeT IO [FilePath ]
You can’t perform that action at this time.
0 commit comments