git.iko.soy/typeable/stackage2nix
on master help sign in
Cleanup benches
commitaac58fac3de95aca13bc09ceb49153ea8a384d63 authorDmitry Bushev <bushevdv@gmail.com> dateWed 20 Dec 2017, 12:31 (9 years ago) parent6fb1d61
1 file changed+7−1
src/Distribution/Nixpkgs/Haskell/FromStack.hs+7−1
src/Distribution/Nixpkgs/Haskell/FromStack.hs+7−1
@@ -32,6 +32,9 @@ data PackageConfig = PackageConfig
3232removeTests :: GenericPackageDescription -> GenericPackageDescription
3333removeTests gd = gd { condTestSuites = [] }
3434
35+removeBenches :: GenericPackageDescription -> GenericPackageDescription
36+removeBenches gd = gd { condBenchmarks = [] }
37+
3538planDependencies :: PackagePlan -> [Dependency]
3639planDependencies = map makeDependency . Map.toList . sdPackages . ppDesc
3740 where
@@ -57,6 +60,9 @@ fromPackage conf pconf plan pkg =
5760 configureTests
5861 | pcTests constraints == Don'tBuild = removeTests
5962 | otherwise = id
63+ configureBenches
64+ | pcBenches constraints == Don'tBuild = removeBenches
65+ | otherwise = id
6066 flags = Map.toList (pcFlagOverrides constraints)
6167 (descr, missingDeps) = finalizeGenericPackageDescription
6268 (haskellResolver conf)
@@ -64,7 +70,7 @@ fromPackage conf pconf plan pkg =
6470 (targetCompiler conf)
6571 flags
6672 (planDependencies plan)
67− (configureTests (pkgCabal pkg))
73+ (configureBenches . configureTests $ pkgCabal pkg)
6874 genericDrv = fromPackageDescription
6975 (haskellResolver conf)
7076 (nixpkgsResolver conf)