@@ -155,12 +155,13 @@ loadPackageDB settings coreMap core deps = do
155155 | otherwise = loop rest
156156
157157 addPackage p v lbs pdb = do
158− let (deps', hasTests, buildTools', mgpd, execs, mgithub) = parseDeps p lbs
158+ let (deps', hasTests, buildToolsExe', buildToolsOther', mgpd, execs, mgithub) = parseDeps p lbs
159159 return $ mappend pdb $ PackageDB $ Map.singleton p PackageInfo
160160 { piVersion = v
161161 , piDeps = deps'
162162 , piHasTests = hasTests
163− , piBuildTools = buildTools'
163+ , piBuildToolsExe = buildToolsExe'
164+ , piBuildToolsAll = buildToolsExe' `Set.union` buildToolsOther'
164165 , piGPD = mgpd
165166 , piExecs = execs
166167 , piGithubUser = mgithub
@@ -176,25 +177,29 @@ loadPackageDB settings coreMap core deps = do
176177 else mconcat $ map (go gpd . snd) $ condTestSuites gpd
177178 , mconcat $ map (go gpd . snd) $ condBenchmarks gpd
178179 ], not $ null $ condTestSuites gpd
179− , Set.fromList $ map depName $ allBuildInfo gpd
180+ , Set.fromList $ map depName $ libExeBuildInfo gpd
181+ , Set.fromList $ map depName $ testBenchBuildInfo gpd
180182 , Just gpd
181183 , Set.fromList $ map (Executable . fst) $ condExecutables gpd
182184 , listToMaybe $ catMaybes
183185 $ parseGithubUserHP (homepage $ packageDescription gpd)
184186 : map parseGithubUserSR (sourceRepos $ packageDescription gpd)
185187 )
186− _ -> (mempty, defaultHasTestSuites, Set.empty, Nothing, Set.empty, Nothing)
188+ _ -> (mempty, defaultHasTestSuites, Set.empty, Set.empty, Nothing, Set.empty, Nothing)
187189 where
188− allBuildInfo gpd = concat
190+ allBuildInfo gpd = libExeBuildInfo gpd ++ testBenchBuildInfo gpd
191+ libExeBuildInfo gpd = concat
189192 [ maybe mempty (goBI libBuildInfo) $ condLibrary gpd
190193 , concat $ map (goBI buildInfo . snd) $ condExecutables gpd
191− , if skipTests p
194+ ]
195+ testBenchBuildInfo gpd = concat
196+ [ if skipTests p
192197 then []
193198 else concat $ map (goBI testBuildInfo . snd) $ condTestSuites gpd
194199 , concat $ map (goBI benchmarkBuildInfo . snd) $ condBenchmarks gpd
195200 ]
196− where
197− goBI f x = buildTools $ f $ condTreeData x
201+ goBI f x = buildTools $ f $ condTreeData x
202+
198203 depName (Dependency (PackageName pn) _) = Executable pn
199204 go gpd tree
200205 = Map.filterWithKey (\k _ -> not $ ignoredDep k)