@@ -23,7 +23,7 @@ import qualified Data.Text as T
23
23
import Data.Void
24
24
import qualified Data.Yaml as Yaml
25
25
import GHC.Fingerprint (fingerprintString )
26
- import HIE.Bios.Config
26
+ import HIE.Bios.Config hiding ( cabalComponent , stackComponent )
27
27
import HIE.Bios.Cradle
28
28
import HIE.Bios.Environment (getCacheDir )
29
29
import HIE.Bios.Types hiding (ActionName (.. ))
@@ -60,7 +60,7 @@ implicitConfig fp = do
60
60
implicitConfig' :: FilePath -> MaybeT IO (CradleType a , FilePath )
61
61
implicitConfig' fp =
62
62
( \ wdir ->
63
- (Bios (wdir </> " .hie-bios" ) Nothing , wdir)
63
+ (Bios (Program $ wdir </> " .hie-bios" ) Nothing Nothing , wdir)
64
64
)
65
65
<$> biosWorkDir fp
66
66
-- <|> (Obelisk,) <$> obeliskWorkDir fp
@@ -79,10 +79,13 @@ implicitConfig' fp =
79
79
c <- cn <$> readPkgs cc gp p
80
80
pure (c, p)
81
81
cabal :: FilePath -> MaybeT IO (CradleType a , FilePath )
82
- cabal = build CabalMulti cabalComponent cabalPkgs
83
- stack = build StackMulti stackComponent stackYamlPkgs
82
+ cabal = build (CabalMulti mempty ) cabalComponent' cabalPkgs
83
+ stack :: FilePath -> MaybeT IO (CradleType a , FilePath )
84
+ stack = build (StackMulti mempty ) stackComponent' stackYamlPkgs
84
85
components f (Package n cs) = map (f n) cs
85
86
87
+ cabalComponent' n c = CabalType . Just <$> cabalComponent n c
88
+ stackComponent' n c = flip StackType Nothing . Just <$> stackComponent n c
86
89
------------------------------------------------------------------------
87
90
-- Cabal Cradle
88
91
-- Works for new-build by invoking `v2-repl` does not support components
0 commit comments