git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix issue where `ghc` != `compiler.ghc865` (#353)

The overrides in the `ghc.nix` overlay were only applied to `compiler.ghc865` (not `ghc`). The fact `ghc` was not the same as `compiler.ghc865` resulted in extra builds of ghc and a lack of caching of `haskell-nix.ghc` (used as the default compiler by `cabalProject`).

commitd722b45c0453f9cdf132efe498cdb7e8db012f43 authorHamish Mackenzie <Hamish.Mackenzie@iohk.io> dateSun 8 Dec 2019, 13:49 (7 years ago) parentf64ff16
1 file changed+3−3
compare with iko/ghcjs-patch-master
unifiedsplit
overlays/bootstrap.nix+3−3
overlays/bootstrap.nix+3−3
@@ -1,10 +1,10 @@
11self: super: {
2− haskell-nix = super.haskell-nix // rec {
2+ haskell-nix = super.haskell-nix // {
33 # Use this to disable the existing haskell infra structure for testing purposes
44 compiler =
55 let bootPkgs = with self.buildPackages; {
66 ghc = buildPackages.haskell-nix.bootstrap.compiler.ghc844;
7− inherit (bootstrap.packages) alex happy hscolour;
7+ inherit (self.haskell-nix.bootstrap.packages) alex happy hscolour;
88 };
99 sphinx = with self.buildPackages; (python3Packages.sphinx_1_7_9 or python3Packages.sphinx);
1010 hsc2hs-align-conditionals-patch = self.fetchpatch {
@@ -195,7 +195,7 @@ self: super: {
195195 '';
196196 });
197197
198− ghc = compiler.ghc865;
198+ ghc = self.haskell-nix.compiler.ghc865;
199199 cabal-install = self.buildPackages.haskell-nix.bootstrap.packages.cabal-install;
200200
201201 # WARN: The `import ../. {}` will prevent