Skip to content

Commit a489e30

Browse files
rdnetto4e6
authored andcommitted
Set buildHaskellPackages, which is required on NixOS 18.03.
1 parent 329fde9 commit a489e30

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff 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

9193
overrideStackage :: StackResolver -> FilePath -> NonEmpty Derivation -> Doc
9294
overrideStackage stackResolver nixpkgsPath packages = vcat

0 commit comments

Comments
 (0)