@@ -16,18 +16,8 @@ run :: IO ()
1616run = do
1717 opts <- execParser pinfo
1818 stackYaml <- either fail pure =<< readStackConfig (opts ^. optStackYaml)
19−
2019 -- generate stackage packages
21− let
22− s2nOptions = S2n.Options
23− { S2n.optBuildPlanFile = opts ^. optStackageBuildPlan
24− , S2n.optAllCabalHashes = opts ^. optAllCabalHashes
25− , S2n.optNixpkgsRepository = opts ^. optNixpkgsRepository
26− , S2n.optNixpkgsMap = Nothing
27− , S2n.optOutPackages = opts ^. optStackageOutPackages
28− , S2n.optOutConfig = opts ^. optStackageOutConfig }
29− buildPlan <- S2n.run s2nOptions
30−
20+ buildPlan <- S2n.run $ mkS2nOptions opts
3121 -- generate haskell packages override
3222 let
3323 pkgConfig = mkPackageConfig (opts ^. optPlatform) (opts ^. optCompilerId)
@@ -36,7 +26,6 @@ run = do
3626 $ stackYaml ^. scPackages
3727 let
3828 out = PP.overrideHaskellPackages overrideConfig packages
39−
4029 writeFile (opts ^. optOutFile) (show out)
4130 putStrLn $ "\nDerivation was written to " ++ opts ^. optOutFile
4231
@@ -45,3 +34,12 @@ mkOverrideConfig opts ghcVersion = OverrideConfig
4534 { _ocGhc = ghcVersion
4635 , _ocStackagePackages = opts ^. optStackageOutPackages
4736 , _ocStackageConfig = opts ^. optStackageOutConfig }
37+
38+mkS2nOptions :: Options -> S2n.Options
39+mkS2nOptions opts = S2n.Options
40+ { S2n.optBuildPlanFile = opts ^. optStackageBuildPlan
41+ , S2n.optAllCabalHashes = opts ^. optAllCabalHashes
42+ , S2n.optNixpkgsRepository = opts ^. optNixpkgsRepository
43+ , S2n.optNixpkgsMap = Nothing
44+ , S2n.optOutPackages = opts ^. optStackageOutPackages
45+ , S2n.optOutConfig = opts ^. optStackageOutConfig }