File tree Expand file tree Collapse file tree
src/Distribution/Nixpkgs/Haskell/Stack Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -79,14 +79,16 @@ overrideHaskellPackages oc packages = vcat
7979 ]
8080 , " in callPackage (nixpkgs.path + \" /pkgs/development/haskell-modules\" ) {"
8181 , nest 2 $ vcat
82- [ attr " ghc" (" pkgs.haskell.compiler." <> toNixGhcVersion (oc ^. ocGhc))
82+ [ attr " ghc" (" pkgs.haskell.compiler." <> nixGhc)
83+ , attr " buildHaskellPackages" (" buildPackages.haskell.packages." <> nixGhc)
8384 , attr " compilerConfig" " self: extends pkgOverrides (stackageConfig self)"
8485 , attr " initialPackages" " stackagePackages"
8586 , attr " configurationCommon" " args: self: super: {}"
8687 , " inherit haskellLib;"
8788 ]
8889 , " }"
89- ]
90+ ] where
91+ nixGhc = toNixGhcVersion (oc ^. ocGhc)
9092
9193overrideStackage :: StackResolver -> FilePath -> NonEmpty Derivation -> Doc
9294overrideStackage stackResolver nixpkgsPath packages = vcat
You can’t perform that action at this time.
0 commit comments