@@ -1,10 +1,10 @@
1self: super: {
1self: super: {
2− haskell-nix = super.haskell-nix // rec {
2+ haskell-nix = super.haskell-nix // {
3 # Use this to disable the existing haskell infra structure for testing purposes
3 # Use this to disable the existing haskell infra structure for testing purposes
5 let bootPkgs = with self.buildPackages; {
5 let bootPkgs = with self.buildPackages; {
6 ghc = buildPackages.haskell-nix.bootstrap.compiler.ghc844;
6 ghc = buildPackages.haskell-nix.bootstrap.compiler.ghc844;
7− inherit (bootstrap.packages) alex happy hscolour;
7+ inherit (self.haskell-nix.bootstrap.packages) alex happy hscolour;
9 sphinx = with self.buildPackages; (python3Packages.sphinx_1_7_9 or python3Packages.sphinx);
9 sphinx = with self.buildPackages; (python3Packages.sphinx_1_7_9 or python3Packages.sphinx);
10 hsc2hs-align-conditionals-patch = self.fetchpatch {
10 hsc2hs-align-conditionals-patch = self.fetchpatch {
@@ -195,7 +195,7 @@ self: super: {
198− ghc = compiler.ghc865;
198+ ghc = self.haskell-nix.compiler.ghc865;
199 cabal-install = self.buildPackages.haskell-nix.bootstrap.packages.cabal-install;
199 cabal-install = self.buildPackages.haskell-nix.bootstrap.packages.cabal-install;
201 # WARN: The `import ../. {}` will prevent
201 # WARN: The `import ../. {}` will prevent