git.iko.soy/typeable/stackage2nix
on master help sign in
Remove benchmark dependencies
137b500Dmitry Bushev
src/Distribution/Nixpkgs/Haskell/FromStack.hs+12−9
compare with master
unifiedsplit
@@ -37,8 +37,8 @@ planDependencies = map makeDependency . Map.toList . sdPackages . ppDesc
37 where
37 where
38 makeDependency (name, depInfo) = Dependency name (diRange depInfo)
38 makeDependency (name, depInfo) = Dependency name (diRange depInfo)
39
39
40−buildNodeM :: PackageSetConfig -> PackageConfig -> PackageName -> PackagePlan -> IO Node
40+buildNode :: PackageSetConfig -> PackageConfig -> PackageName -> PackagePlan -> IO Node
41−buildNodeM conf pconf name plan = do
41+buildNode conf pconf name plan = do
42 let
42 let
43 cabalHashes = maybe mempty cfiHashes $ ppCabalFileInfo plan
43 cabalHashes = maybe mempty cfiHashes $ ppCabalFileInfo plan
44 mGitSha1 = Map.lookup "GitSHA1" cabalHashes
44 mGitSha1 = Map.lookup "GitSHA1" cabalHashes
@@ -50,10 +50,8 @@ fromPackage conf pconf plan pkg =
50 let
50 let
51 constraints = ppConstraints plan
51 constraints = ppConstraints plan
52 testsEnabled =
52 testsEnabled =
53− enableCheck pconf &&
54 pcTests constraints == ExpectSuccess
53 pcTests constraints == ExpectSuccess
55 haddocksEnabled =
54 haddocksEnabled =
56− enableHaddock pconf &&
57 pcHaddocks constraints == ExpectSuccess &&
55 pcHaddocks constraints == ExpectSuccess &&
58 not (Set.null (sdModules (ppDesc plan)))
56 not (Set.null (sdModules (ppDesc plan)))
59 configureTests
57 configureTests
@@ -83,11 +81,16 @@ fromPackage conf pconf plan pkg =
83 testsEnabled &&
81 testsEnabled &&
84 not (null missingDeps) &&
82 not (null missingDeps) &&
85 setOf (folded . to depName) missingDeps `hasIntersection` testDeps descr
83 setOf (folded . to depName) missingDeps `hasIntersection` testDeps descr
86− in
84+ in finalizePackage pkg pconf
87− genericDrv
85+ $ genericDrv
88− & src .~ pkgSource pkg
89 & doCheck .~ testsEnabled
86 & doCheck .~ testsEnabled
90 & runHaddock .~ haddocksEnabled
87 & runHaddock .~ haddocksEnabled
91 & metaSection . Nix.broken .~ brokenEnabled
88 & metaSection . Nix.broken .~ brokenEnabled
92− -- TODO: remove after Nixos/Nixpkgs #27196 released
89+
93− & enableSeparateDataOutput .~ False
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
57 s2nPackageConfig = PackageConfig
57 s2nPackageConfig = PackageConfig
58 { enableCheck = opts ^. optDoCheckStackage
58 { enableCheck = opts ^. optDoCheckStackage
59 , enableHaddock = opts ^. optDoHaddockStackage }
59 , enableHaddock = opts ^. optDoHaddockStackage }
60− stackagePackages <- traverse (uncurry (buildNodeM s2nPackageSetConfig s2nPackageConfig))
60+ stackagePackages <- traverse (uncurry (buildNode s2nPackageSetConfig s2nPackageConfig))
61 $ Map.toList (bpPackages buildPlan)
61 $ Map.toList (bpPackages buildPlan)
62
62
63 let
63 let
@@ -95,7 +95,7 @@ run = do
95 (opts ^. optAllCabalHashesRepo)
95 (opts ^. optAllCabalHashesRepo)
96 (opts ^. optNixpkgsRepository)
96 (opts ^. optNixpkgsRepository)
97 buildPlan
97 buildPlan
98− nodes <- traverse (uncurry (buildNodeM packageSetConfig packageConfig))
98+ nodes <- traverse (uncurry (buildNode packageSetConfig packageConfig))
99 $ Map.toList (bpPackages buildPlan)
99 $ Map.toList (bpPackages buildPlan)
100
100
101 writeOutFile buildPlanFile (opts ^. optOutStackagePackages)
101 writeOutFile buildPlanFile (opts ^. optOutStackagePackages)
src/Runner/Cli.hs+15−15
@@ -26,21 +26,21 @@ data ConfigOrigin
26makePrisms ''ConfigOrigin
26makePrisms ''ConfigOrigin
27
27
28data Options = Options
28data Options = Options
29− { _optAllCabalHashesRepo :: !FilePath
29+ { _optAllCabalHashesRepo :: FilePath
30− , _optLtsHaskellRepo :: !FilePath
30+ , _optLtsHaskellRepo :: FilePath
31− , _optOutStackagePackages :: !FilePath
31+ , _optOutStackagePackages :: FilePath
32− , _optOutStackageConfig :: !FilePath
32+ , _optOutStackageConfig :: FilePath
33− , _optOutPackagesClosure :: !Bool
33+ , _optOutPackagesClosure :: Bool
34− , _optOutDerivation :: !FilePath
34+ , _optOutDerivation :: FilePath
35− , _optDoCheckPackages :: !Bool
35+ , _optDoCheckPackages :: Bool
36− , _optDoHaddockPackages :: !Bool
36+ , _optDoHaddockPackages :: Bool
37− , _optDoCheckStackage :: !Bool
37+ , _optDoCheckStackage :: Bool
38− , _optDoHaddockStackage :: !Bool
38+ , _optDoHaddockStackage :: Bool
39− , _optHackageDb :: !(Maybe HackageDb)
39+ , _optHackageDb :: (Maybe HackageDb)
40− , _optNixpkgsRepository :: !FilePath
40+ , _optNixpkgsRepository :: FilePath
41− , _optCompilerId :: !CompilerId
41+ , _optCompilerId :: CompilerId
42− , _optPlatform :: !Platform
42+ , _optPlatform :: Platform
43− , _optConfigOrigin :: !ConfigOrigin
43+ , _optConfigOrigin :: ConfigOrigin
44 } deriving (Show)
44 } deriving (Show)
45
45
46makeLenses ''Options
46makeLenses ''Options