git.iko.soy/typeable/stackage2nix
on master help sign in
Set buildHaskellPackages, which is required on NixOS 18.03.
commita489e30136c7247e643da93d2dfe2ed2553b8641 authorReuben D'Netto <rdnetto@gmail.com> dateThu 29 Mar 2018, 18:15 (9 years ago) parent329fde9
1 file changed+4−2
src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs+4−2
src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs+4−2
@@ -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