git.iko.soy/typeable/stackage2nix
on master help sign in
Cleanup benches
aac58faDmitry Bushev
src/Distribution/Nixpkgs/Haskell/FromStack.hs+7−1
compare with master
unifiedsplit
@@ -32,6 +32,9 @@ data PackageConfig = PackageConfig
32removeTests :: GenericPackageDescription -> GenericPackageDescription
32removeTests :: GenericPackageDescription -> GenericPackageDescription
33removeTests gd = gd { condTestSuites = [] }
33removeTests gd = gd { condTestSuites = [] }
34
34
35+removeBenches :: GenericPackageDescription -> GenericPackageDescription
36+removeBenches gd = gd { condBenchmarks = [] }
37+
35planDependencies :: PackagePlan -> [Dependency]
38planDependencies :: PackagePlan -> [Dependency]
36planDependencies = map makeDependency . Map.toList . sdPackages . ppDesc
39planDependencies = map makeDependency . Map.toList . sdPackages . ppDesc
37 where
40 where
@@ -57,6 +60,9 @@ fromPackage conf pconf plan pkg =
57 configureTests
60 configureTests
58 | pcTests constraints == Don'tBuild = removeTests
61 | pcTests constraints == Don'tBuild = removeTests
59 | otherwise = id
62 | otherwise = id
63+ configureBenches
64+ | pcBenches constraints == Don'tBuild = removeBenches
65+ | otherwise = id
60 flags = Map.toList (pcFlagOverrides constraints)
66 flags = Map.toList (pcFlagOverrides constraints)
61 (descr, missingDeps) = finalizeGenericPackageDescription
67 (descr, missingDeps) = finalizeGenericPackageDescription
62 (haskellResolver conf)
68 (haskellResolver conf)
@@ -64,7 +70,7 @@ fromPackage conf pconf plan pkg =
64 (targetCompiler conf)
70 (targetCompiler conf)
65 flags
71 flags
66 (planDependencies plan)
72 (planDependencies plan)
67− (configureTests (pkgCabal pkg))
73+ (configureBenches . configureTests $ pkgCabal pkg)
68 genericDrv = fromPackageDescription
74 genericDrv = fromPackageDescription
69 (haskellResolver conf)
75 (haskellResolver conf)
70 (nixpkgsResolver conf)
76 (nixpkgsResolver conf)