File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -3,4 +3,4 @@ packages: .
33source-repository-package
44 type : git
55 location : https://github.com/Avi-D-coder/implicit-hie.git
6- tag : e033a562a8b18878d354b91977dbcd33604ad554
6+ tag : 48c33baf84d612f1ad126e636ddec21f61b88f0e
Original file line number Diff line number Diff line change @@ -139,15 +139,16 @@ implicitConfig' fp = (\wdir ->
139139 <|> (stackExecutable >> stackYamlDir fp >>= stack)
140140 <|> (cabalExecutable >> cabalFile fp >>= cabal)
141141 where
142- readPkgs f p = do
143- cfs <- nestedCabalFiles p
144- pkgs <- catMaybes <$> mapM (nestedPkg p) cfs
142+ readPkgs f gp p = do
143+ cfs <- gp p
144+ pkgs <- liftIO $ catMaybes <$> mapM (nestedPkg p) cfs
145145 pure $ concatMap (components f) pkgs
146- build cn cc p = do
147- c <- liftIO $ cn <$> readPkgs cc p
146+ build cn cc gp p = do
147+ c <- cn <$> readPkgs cc gp p
148148 pure (c, p)
149- cabal = build CabalMulti cabalComponent
150- stack = build StackMulti stackComponent
149+ cabal :: FilePath -> MaybeT IO (CradleType a , FilePath )
150+ cabal = build CabalMulti cabalComponent cabalPkgs
151+ stack = build StackMulti stackComponent stackYamlPkgs
151152 components f (Package n cs) = map (f n) cs
152153
153154yamlConfig :: FilePath -> MaybeT IO FilePath
You can’t perform that action at this time.
0 commit comments