git.iko.soy/typeable/stackage2nix
on master help sign in
Generate packages with buildHaskellPackages
6d9f565Dmitry Bushev
src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs+3−1
compare with master
unifiedsplit
@@ -109,6 +109,7 @@ pPrintHaskellPackages :: OverrideConfig -> Doc
109pPrintHaskellPackages oc = vcat
109pPrintHaskellPackages oc = vcat
110 [ funargs
110 [ funargs
111 [ "callPackage"
111 [ "callPackage"
112+ , "buildPackages"
112 , "pkgs"
113 , "pkgs"
113 , "stdenv"
114 , "stdenv"
114 , "lib"
115 , "lib"
@@ -125,7 +126,8 @@ pPrintHaskellPackages oc = vcat
125 , attr "haskellPackages" $ vcat
126 , attr "haskellPackages" $ vcat
126 [ "pkgs.callPackage makePackageSet {"
127 [ "pkgs.callPackage makePackageSet {"
127 , nest 2 $ vcat
128 , nest 2 $ vcat
128− [ attr "ghc" ("pkgs.haskell.compiler." <> toNixGhcVersion (oc ^. ocGhc))
129+ [ attr "ghc" ("buildPackages.haskell.compiler." <> toNixGhcVersion (oc ^. ocGhc))
130+ , attr "buildHaskellPackages" ("buildPackages.haskell.packages." <> toNixGhcVersion (oc ^. ocGhc))
129 , attr "package-set" . importStackagePackages $ oc ^. ocStackagePackages
131 , attr "package-set" . importStackagePackages $ oc ^. ocStackagePackages
130 , "inherit stdenv haskellLib extensible-self;"
132 , "inherit stdenv haskellLib extensible-self;"
131 ]
133 ]