git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix eval on aarch64. (#1168)

* Don't use ghc865 for bootstrapping, since it's broken on aarch64. * Use ghc884 to bootstrap 8.10.x on aarch64

commitfe0ece2551ee3aa45c0c9143fceccc813a234eee authorTravis Whitaker <pi.boy.travis@gmail.com> dateFri 27 Aug 2021, 19:22 (5 years ago) parent37f312d
1 file changed+18−12
compare with iko/ghcjs-patch-master
unifiedsplit
overlays/bootstrap.nix+18−12
overlays/bootstrap.nix+18−12
@@ -365,8 +365,9 @@ in {
365365 extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8101; };
366366
367367 bootPkgs = bootPkgs // {
368− # Not using 8.8 due to https://gitlab.haskell.org/ghc/ghc/-/issues/18143
369− ghc = final.buildPackages.buildPackages.haskell-nix.compiler.ghc865;
368+ ghc = if (final.buildPlatform.isAarch64 || final.targetPlatform.isAarch64)
369+ then final.buildPackages.buildPackages.haskell-nix.compiler.ghc884
370+ else final.buildPackages.buildPackages.haskell-nix.compiler.ghc865;
370371 };
371372 inherit sphinx installDeps;
372373
@@ -385,8 +386,9 @@ in {
385386 extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8102; };
386387
387388 bootPkgs = bootPkgs // {
388− # Not using 8.8 due to https://gitlab.haskell.org/ghc/ghc/-/issues/18143
389− ghc = final.buildPackages.buildPackages.haskell-nix.compiler.ghc865;
389+ ghc = if (final.buildPlatform.isAarch64 || final.targetPlatform.isAarch64)
390+ then final.buildPackages.buildPackages.haskell-nix.compiler.ghc884
391+ else final.buildPackages.buildPackages.haskell-nix.compiler.ghc865;
390392 };
391393 inherit sphinx installDeps;
392394
@@ -405,8 +407,9 @@ in {
405407 extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8103; };
406408
407409 bootPkgs = bootPkgs // {
408− # Not using 8.8 due to https://gitlab.haskell.org/ghc/ghc/-/issues/18143
409− ghc = final.buildPackages.buildPackages.haskell-nix.compiler.ghc865;
410+ ghc = if (final.buildPlatform.isAarch64 || final.targetPlatform.isAarch64)
411+ then final.buildPackages.buildPackages.haskell-nix.compiler.ghc884
412+ else final.buildPackages.buildPackages.haskell-nix.compiler.ghc865;
410413 };
411414 inherit sphinx installDeps;
412415
@@ -425,8 +428,9 @@ in {
425428 extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8104; };
426429
427430 bootPkgs = bootPkgs // {
428− # Not using 8.8 due to https://gitlab.haskell.org/ghc/ghc/-/issues/18143
429− ghc = final.buildPackages.buildPackages.haskell-nix.compiler.ghc865;
431+ ghc = if (final.buildPlatform.isAarch64 || final.targetPlatform.isAarch64)
432+ then final.buildPackages.buildPackages.haskell-nix.compiler.ghc884
433+ else final.buildPackages.buildPackages.haskell-nix.compiler.ghc865;
430434 };
431435 inherit sphinx installDeps;
432436
@@ -445,8 +449,9 @@ in {
445449 extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8105; };
446450
447451 bootPkgs = bootPkgs // {
448− # Not using 8.8 due to https://gitlab.haskell.org/ghc/ghc/-/issues/18143
449− ghc = final.buildPackages.buildPackages.haskell-nix.compiler.ghc865;
452+ ghc = if (final.buildPlatform.isAarch64 || final.targetPlatform.isAarch64)
453+ then final.buildPackages.buildPackages.haskell-nix.compiler.ghc884
454+ else final.buildPackages.buildPackages.haskell-nix.compiler.ghc865;
450455 };
451456 inherit sphinx installDeps;
452457
@@ -485,8 +490,9 @@ in {
485490 extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc810420210212; };
486491
487492 bootPkgs = bootPkgs // {
488− # Not using 8.8 due to https://gitlab.haskell.org/ghc/ghc/-/issues/18143
489− ghc = final.buildPackages.buildPackages.haskell-nix.compiler.ghc865;
493+ ghc = if (final.buildPlatform.isAarch64 || final.targetPlatform.isAarch64)
494+ then final.buildPackages.buildPackages.haskell-nix.compiler.ghc884
495+ else final.buildPackages.buildPackages.haskell-nix.compiler.ghc865;
490496 };
491497 inherit sphinx installDeps;
492498