git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix #836 (#836) (#837)

* Fix #836 (#836) * Fix cross compilers and use ghc 8.8 to build 8.10 Co-authored-by: Julien Moutinho <julm+haskell.nix@sourcephile.fr> Co-authored-by: Hamish Mackenzie <Hamish.Mackenzie@iohk.io>

commit565db5410605db0135c229336eea7f906ab1253f authorJulien Moutinho <ju1m@users.noreply.github.com> dateMon 7 Sep 2020, 16:38 (6 years ago) parentf655e66
1 file changed+4−10
compare with iko/ghcjs-patch-master
unifiedsplit
overlays/bootstrap.nix+4−10
overlays/bootstrap.nix+4−10
@@ -327,14 +327,11 @@ in {
327327
328328 ghc-patches = ghc-patches "8.8.4";
329329 };
330− ghc8101 =
331− let
332− buildPkgs = import final.path ((import ../. {}).nixpkgsArgs // { system = final.stdenv.system; });
333− in final.callPackage ../compiler/ghc {
330+ ghc8101 = final.callPackage ../compiler/ghc {
334331 extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8101; };
335332
336333 bootPkgs = bootPkgs // {
337− ghc = buildPkgs.haskell-nix.compiler.ghc884;
334+ ghc = final.buildPackages.buildPackages.haskell-nix.compiler.ghc884;
338335 };
339336 inherit sphinx installDeps;
340337
@@ -349,14 +346,11 @@ in {
349346
350347 ghc-patches = ghc-patches "8.10.1";
351348 };
352− ghc8102 =
353− let
354− buildPkgs = import final.path ((import ../. {}).nixpkgsArgs // { system = final.stdenv.system; });
355− in final.callPackage ../compiler/ghc {
349+ ghc8102 = final.callPackage ../compiler/ghc {
356350 extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8102; };
357351
358352 bootPkgs = bootPkgs // {
359− ghc = buildPkgs.haskell-nix.compiler.ghc884;
353+ ghc = final.buildPackages.buildPackages.haskell-nix.compiler.ghc884;
360354 };
361355 inherit sphinx installDeps;
362356