aboutsummaryrefslogtreecommitdiff
path: root/src/CabalHelper/Compiletime/Types.hs
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2020-05-02 01:55:55 +0200
committerDaniel Gröber <dxld@darkboxed.org>2020-05-02 15:44:26 +0200
commitf0741c61bd82ec0f94edcfa8d950f349eac86c33 (patch)
treeaa381f24429d2e5f50a7f07eee6dec06f279aa0b /src/CabalHelper/Compiletime/Types.hs
parent11a515ed0e887eef081e514b51f29589cf6693ca (diff)
Ignore setup components from plan.json in readUnitInfo
Cabal includes the Setup.hs executable as a component in plan.json, however there isn't a target to build it directly so we just ignore it for not when reading unit info.
Diffstat (limited to 'src/CabalHelper/Compiletime/Types.hs')
-rw-r--r--src/CabalHelper/Compiletime/Types.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/CabalHelper/Compiletime/Types.hs b/src/CabalHelper/Compiletime/Types.hs
index b96101a..bb36df8 100644
--- a/src/CabalHelper/Compiletime/Types.hs
+++ b/src/CabalHelper/Compiletime/Types.hs
@@ -348,8 +348,7 @@ data UnitImpl pt where
UnitImplV1 :: UnitImpl ('Cabal 'CV1)
UnitImplV2 ::
- { uiV2ComponentNames :: ![ChComponentName]
- , uiV2Components :: ![String]
+ { uiV2Components :: ![(ChComponentName, String)]
, uiV2OnlyDependencies :: !Bool
} -> UnitImpl ('Cabal 'CV2)
@@ -366,7 +365,7 @@ deriving instance Show (UnitImpl pt)
-- of helper invocations for clients that don't need to know the entire project
-- structure.
uComponentName :: Unit pt -> Maybe ChComponentName
-uComponentName Unit { uImpl=UnitImplV2 { uiV2ComponentNames=[comp] } } =
+uComponentName Unit { uImpl=UnitImplV2 { uiV2Components=[(comp, _)] } } =
Just comp
uComponentName _ =
Nothing