git.iko.soy/typeable/stackage2nix
on master help sign in
Upd: cabal2nix deps
commitba12e019cad739021b3c051f018221dcc773baed authorDmitry Bushev <bushevdv@gmail.com> dateSat 10 Jun 2017, 17:42 (9 years ago) parentf4e8eec
2 files changed+9−6
src/Runner.hs+8−5 stack.yaml+1−1
src/Runner.hs+8−5
@@ -1,4 +1,4 @@
1−module Runner where
1+module Runner ( run ) where
22
33import Control.Lens
44import Distribution.Nixpkgs.Haskell.Stack
@@ -14,12 +14,15 @@ run = do
1414 stackYaml <- either fail pure =<< readStackConfig (opts ^. optStackYaml)
1515 let
1616 pkgConfig = mkPackageConfig (opts ^. optPlatform) (opts ^. optCompilerId)
17− overrideConfig = OverrideConfig
18− { _ocGhc = "ghc802"
19− , _ocStackagePackages = unStackagePackages <$> opts ^. optStackagePackages
20− , _ocStackageConfig = unStackageConfig <$> opts ^. optStackageConfig }
17+ overrideConfig = mkOverrideConfig opts
2118 packages <- traverse (packageDerivation pkgConfig (opts ^. optHackageDb))
2219 $ stackYaml ^. scPackages
2320 let
2421 out = PP.overrideHaskellPackages overrideConfig packages
2522 print out
23+
24+mkOverrideConfig :: Options -> OverrideConfig
25+mkOverrideConfig opts = OverrideConfig
26+ { _ocGhc = "ghc802"
27+ , _ocStackagePackages = unStackagePackages <$> opts ^. optStackagePackages
28+ , _ocStackageConfig = unStackageConfig <$> opts ^. optStackageConfig }
stack.yaml+1−1
@@ -3,7 +3,7 @@ packages:
33- '.'
44- location:
55 git: https://github.com/4e6/cabal2nix.git
6− commit: 94a709c1d01e2c5ad2680be918566f24ab0b1099
6+ commit: 7df95c029fb2e33dc9176796e5055bd6c5175ed3
77 extra-dep: true
88extra-deps:
99- distribution-nixpkgs-1.1