git.iko.soy/typeable/stackage2nix
on master help sign in
Set buildHaskellPackages, which is required on NixOS 18.03.
a489e30Reuben D'Netto
src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs+4−2
compare with master
unifiedsplit
@@ -79,14 +79,16 @@ overrideHaskellPackages oc packages = vcat
79 ]
79 ]
80 , "in callPackage (nixpkgs.path + \"/pkgs/development/haskell-modules\") {"
80 , "in callPackage (nixpkgs.path + \"/pkgs/development/haskell-modules\") {"
81 , nest 2 $ vcat
81 , 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)
83 , attr "compilerConfig" "self: extends pkgOverrides (stackageConfig self)"
84 , attr "compilerConfig" "self: extends pkgOverrides (stackageConfig self)"
84 , attr "initialPackages" "stackagePackages"
85 , attr "initialPackages" "stackagePackages"
85 , attr "configurationCommon" "args: self: super: {}"
86 , attr "configurationCommon" "args: self: super: {}"
86 , "inherit haskellLib;"
87 , "inherit haskellLib;"
87 ]
88 ]
88 , "}"
89 , "}"
89− ]
90+ ] where
91+ nixGhc = toNixGhcVersion (oc ^. ocGhc)
90
92
91overrideStackage :: StackResolver -> FilePath -> NonEmpty Derivation -> Doc
93overrideStackage :: StackResolver -> FilePath -> NonEmpty Derivation -> Doc
92overrideStackage stackResolver nixpkgsPath packages = vcat
94overrideStackage stackResolver nixpkgsPath packages = vcat