@@ -1,4 +1,4 @@
1−module Runner where
1+module Runner ( run ) where
3import Control.Lens
3import Control.Lens
4import Distribution.Nixpkgs.Haskell.Stack
4import Distribution.Nixpkgs.Haskell.Stack
@@ -14,12 +14,15 @@ run = do
14 stackYaml <- either fail pure =<< readStackConfig (opts ^. optStackYaml)
14 stackYaml <- either fail pure =<< readStackConfig (opts ^. optStackYaml)
16 pkgConfig = mkPackageConfig (opts ^. optPlatform) (opts ^. optCompilerId)
16 pkgConfig = mkPackageConfig (opts ^. optPlatform) (opts ^. optCompilerId)
17− overrideConfig = OverrideConfig
17+ overrideConfig = mkOverrideConfig opts
19− , _ocStackagePackages = unStackagePackages <$> opts ^. optStackagePackages
20− , _ocStackageConfig = unStackageConfig <$> opts ^. optStackageConfig }
21 packages <- traverse (packageDerivation pkgConfig (opts ^. optHackageDb))
18 packages <- traverse (packageDerivation pkgConfig (opts ^. optHackageDb))
22 $ stackYaml ^. scPackages
19 $ stackYaml ^. scPackages
24 out = PP.overrideHaskellPackages overrideConfig packages
21 out = PP.overrideHaskellPackages overrideConfig packages
24+mkOverrideConfig :: Options -> OverrideConfig
25+mkOverrideConfig opts = OverrideConfig
27+ , _ocStackagePackages = unStackagePackages <$> opts ^. optStackagePackages
28+ , _ocStackageConfig = unStackageConfig <$> opts ^. optStackageConfig }