@@ -266,25 +266,27 @@ self: super: rec {
266 # hackage with haskell.nix. For alex and happy we
266 # hackage with haskell.nix. For alex and happy we
267 # need to use the boot strap compiler as we need them
267 # need to use the boot strap compiler as we need them
268 # to build ghcs from source.
268 # to build ghcs from source.
269− alex = (hackage-package {
269+ alex-project = hackage-project {
270 inherit ghc;
270 inherit ghc;
271 inherit (bootstrap.haskell.packages) cabal-install nix-tools hpack;
271 inherit (bootstrap.haskell.packages) cabal-install nix-tools hpack;
272 name = "alex"; version = "3.2.4";
272 name = "alex"; version = "3.2.4";
273 index-state = "2019-10-20T00:00:00Z";
273 index-state = "2019-10-20T00:00:00Z";
274− }).components.exes.alex;
275+ alex = bootstrap.haskell.packages.alex-project.alex.components.exes.alex;
275− happy = (hackage-package {
276+ happy-project = hackage-project {
276 inherit ghc;
277 inherit ghc;
277 inherit (bootstrap.haskell.packages) cabal-install nix-tools hpack;
278 inherit (bootstrap.haskell.packages) cabal-install nix-tools hpack;
278 name = "happy"; version = "1.19.11";
279 name = "happy"; version = "1.19.11";
279 index-state = "2019-10-20T00:00:00Z";
280 index-state = "2019-10-20T00:00:00Z";
280− }).components.exes.happy;
282+ happy = bootstrap.haskell.packages.happy-project.happy.components.exes.happy;
282− hscolour = (hackage-package {
283+ hscolour-project = hackage-project {
283 inherit ghc;
284 inherit ghc;
284 inherit (bootstrap.haskell.packages) cabal-install nix-tools hpack;
285 inherit (bootstrap.haskell.packages) cabal-install nix-tools hpack;
285 name = "hscolour"; version = "1.24.4";
286 name = "hscolour"; version = "1.24.4";
286 index-state = "2019-10-20T00:00:00Z";
287 index-state = "2019-10-20T00:00:00Z";
287− }).components.exes.HsColour;
289+ hscolour = bootstrap.haskell.packages.hscolour-project.hscolour.components.exes.HsColour;