File tree Expand file tree Collapse file tree 3 files changed +9
-0
lines changed Expand file tree Collapse file tree 3 files changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -411,6 +411,9 @@ binfoFieldDescrs =
411
411
, commaListField " build-tools"
412
412
disp parse
413
413
buildTools (\ xs binfo -> binfo{buildTools= xs})
414
+ , commaListField " tool-depends"
415
+ disp parse
416
+ toolDepends (\ xs binfo -> binfo{toolDepends= xs})
414
417
, commaListFieldWithSep vcat " build-depends"
415
418
disp parse
416
419
targetBuildDepends (\ xs binfo -> binfo{targetBuildDepends= xs})
Original file line number Diff line number Diff line change @@ -417,6 +417,9 @@ binfoFieldDescrs =
417
417
, commaListField " build-tools"
418
418
disp parsec
419
419
buildTools (\ xs binfo -> binfo{buildTools= xs})
420
+ , commaListField " tool-depends"
421
+ disp parsec
422
+ toolDepends (\ xs binfo -> binfo{toolDepends= xs})
420
423
, commaListFieldWithSep vcat " build-depends"
421
424
disp parsec
422
425
targetBuildDepends (\ xs binfo -> binfo{targetBuildDepends= xs})
Original file line number Diff line number Diff line change @@ -30,6 +30,7 @@ import Language.Haskell.Extension
30
30
data BuildInfo = BuildInfo {
31
31
buildable :: Bool , -- ^ component is buildable here
32
32
buildTools :: [LegacyExeDependency ], -- ^ tools needed to build this bit
33
+ toolDepends :: [ExeDependency ], -- ^ haskell tools needed to build this bit
33
34
cppOptions :: [String ], -- ^ options for pre-processing Haskell code
34
35
ccOptions :: [String ], -- ^ options for C compiler
35
36
ldOptions :: [String ], -- ^ options for linker
@@ -71,6 +72,7 @@ instance Monoid BuildInfo where
71
72
mempty = BuildInfo {
72
73
buildable = True ,
73
74
buildTools = [] ,
75
+ toolDepends = [] ,
74
76
cppOptions = [] ,
75
77
ccOptions = [] ,
76
78
ldOptions = [] ,
@@ -106,6 +108,7 @@ instance Semigroup BuildInfo where
106
108
a <> b = BuildInfo {
107
109
buildable = buildable a && buildable b,
108
110
buildTools = combine buildTools,
111
+ toolDepends = combine toolDepends,
109
112
cppOptions = combine cppOptions,
110
113
ccOptions = combine ccOptions,
111
114
ldOptions = combine ldOptions,
You can’t perform that action at this time.
0 commit comments