git.iko.soy/typeable/stackage2nix
on master help sign in
Remove benchmark dependencies
commit137b5006396120312f23e1c3ae64fbb58e19b845 authorDmitry Bushev <bushevdv@gmail.com> dateMon 11 Dec 2017, 13:35 (9 years ago) parentb19fea5
3 files changed+29−26
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromStack.hs+12−9 src/Runner.hs+2−2 src/Runner/Cli.hs+15−15
src/Distribution/Nixpkgs/Haskell/FromStack.hs+12−9
@@ -37,8 +37,8 @@ planDependencies = map makeDependency . Map.toList . sdPackages . ppDesc
3737 where
3838 makeDependency (name, depInfo) = Dependency name (diRange depInfo)
3939
40−buildNodeM :: PackageSetConfig -> PackageConfig -> PackageName -> PackagePlan -> IO Node
41−buildNodeM conf pconf name plan = do
40+buildNode :: PackageSetConfig -> PackageConfig -> PackageName -> PackagePlan -> IO Node
41+buildNode conf pconf name plan = do
4242 let
4343 cabalHashes = maybe mempty cfiHashes $ ppCabalFileInfo plan
4444 mGitSha1 = Map.lookup "GitSHA1" cabalHashes
@@ -50,10 +50,8 @@ fromPackage conf pconf plan pkg =
5050 let
5151 constraints = ppConstraints plan
5252 testsEnabled =
53− enableCheck pconf &&
5453 pcTests constraints == ExpectSuccess
5554 haddocksEnabled =
56− enableHaddock pconf &&
5755 pcHaddocks constraints == ExpectSuccess &&
5856 not (Set.null (sdModules (ppDesc plan)))
5957 configureTests
@@ -83,11 +81,16 @@ fromPackage conf pconf plan pkg =
8381 testsEnabled &&
8482 not (null missingDeps) &&
8583 setOf (folded . to depName) missingDeps `hasIntersection` testDeps descr
86− in
87− genericDrv
88− & src .~ pkgSource pkg
84+ in finalizePackage pkg pconf
85+ $ genericDrv
8986 & doCheck .~ testsEnabled
9087 & runHaddock .~ haddocksEnabled
9188 & metaSection . Nix.broken .~ brokenEnabled
92− -- TODO: remove after Nixos/Nixpkgs #27196 released
93− & enableSeparateDataOutput .~ False
89+
90+finalizePackage :: Package -> PackageConfig -> Derivation -> Derivation
91+finalizePackage pkg pconf drv = drv
92+ & src .~ pkgSource pkg
93+ & doCheck &&~ enableCheck pconf
94+ & runHaddock &&~ enableHaddock pconf
95+ -- Will never run benchmarks
96+ & benchmarkDepends .~ mempty
src/Runner.hs+2−2
@@ -57,7 +57,7 @@ run = do
5757 s2nPackageConfig = PackageConfig
5858 { enableCheck = opts ^. optDoCheckStackage
5959 , enableHaddock = opts ^. optDoHaddockStackage }
60− stackagePackages <- traverse (uncurry (buildNodeM s2nPackageSetConfig s2nPackageConfig))
60+ stackagePackages <- traverse (uncurry (buildNode s2nPackageSetConfig s2nPackageConfig))
6161 $ Map.toList (bpPackages buildPlan)
6262
6363 let
@@ -95,7 +95,7 @@ run = do
9595 (opts ^. optAllCabalHashesRepo)
9696 (opts ^. optNixpkgsRepository)
9797 buildPlan
98− nodes <- traverse (uncurry (buildNodeM packageSetConfig packageConfig))
98+ nodes <- traverse (uncurry (buildNode packageSetConfig packageConfig))
9999 $ Map.toList (bpPackages buildPlan)
100100
101101 writeOutFile buildPlanFile (opts ^. optOutStackagePackages)
src/Runner/Cli.hs+15−15
@@ -26,21 +26,21 @@ data ConfigOrigin
2626makePrisms ''ConfigOrigin
2727
2828data Options = Options
29− { _optAllCabalHashesRepo :: !FilePath
30− , _optLtsHaskellRepo :: !FilePath
31− , _optOutStackagePackages :: !FilePath
32− , _optOutStackageConfig :: !FilePath
33− , _optOutPackagesClosure :: !Bool
34− , _optOutDerivation :: !FilePath
35− , _optDoCheckPackages :: !Bool
36− , _optDoHaddockPackages :: !Bool
37− , _optDoCheckStackage :: !Bool
38− , _optDoHaddockStackage :: !Bool
39− , _optHackageDb :: !(Maybe HackageDb)
40− , _optNixpkgsRepository :: !FilePath
41− , _optCompilerId :: !CompilerId
42− , _optPlatform :: !Platform
43− , _optConfigOrigin :: !ConfigOrigin
29+ { _optAllCabalHashesRepo :: FilePath
30+ , _optLtsHaskellRepo :: FilePath
31+ , _optOutStackagePackages :: FilePath
32+ , _optOutStackageConfig :: FilePath
33+ , _optOutPackagesClosure :: Bool
34+ , _optOutDerivation :: FilePath
35+ , _optDoCheckPackages :: Bool
36+ , _optDoHaddockPackages :: Bool
37+ , _optDoCheckStackage :: Bool
38+ , _optDoHaddockStackage :: Bool
39+ , _optHackageDb :: (Maybe HackageDb)
40+ , _optNixpkgsRepository :: FilePath
41+ , _optCompilerId :: CompilerId
42+ , _optPlatform :: Platform
43+ , _optConfigOrigin :: ConfigOrigin
4444 } deriving (Show)
4545
4646makeLenses ''Options