Skip to content

Commit 4cb78ba

Browse files
authored
Fix building ghc964 with latest nixpkgs-unstable pin (#2333)
Fixes #2330 This fixes GHC 9.6.4 native, musl and ghcjs. For mingwW64 and arm cross compilation it looks we still need to build a more recent GHC version (see https://ci.zw3rk.com/eval/46036#tabs-still-fail).
1 parent 0afcd90 commit 4cb78ba

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

overlays/bootstrap.nix

+4-18
Original file line numberDiff line numberDiff line change
@@ -684,12 +684,7 @@ in {
684684
bootPkgs = bootPkgsGhc94 // {
685685
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
686686
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc961
687-
else final.buildPackages.buildPackages.haskell.compiler.ghc966
688-
or final.buildPackages.buildPackages.haskell.compiler.ghc965
689-
or final.buildPackages.buildPackages.haskell.compiler.ghc964
690-
or final.buildPackages.buildPackages.haskell.compiler.ghc963
691-
or final.buildPackages.buildPackages.haskell.compiler.ghc962
692-
or final.buildPackages.buildPackages.haskell.compiler.ghc945
687+
else final.buildPackages.buildPackages.haskell.compiler.ghc945
693688
or final.buildPackages.buildPackages.haskell.compiler.ghc944
694689
or final.buildPackages.buildPackages.haskell.compiler.ghc943;
695690
};
@@ -710,11 +705,7 @@ in {
710705
bootPkgs = bootPkgsGhc94 // {
711706
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
712707
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc962
713-
else final.buildPackages.buildPackages.haskell.compiler.ghc966
714-
or final.buildPackages.buildPackages.haskell.compiler.ghc965
715-
or final.buildPackages.buildPackages.haskell.compiler.ghc964
716-
or final.buildPackages.buildPackages.haskell.compiler.ghc963
717-
or final.buildPackages.buildPackages.haskell.compiler.ghc962
708+
else final.buildPackages.buildPackages.haskell.compiler.ghc962
718709
or final.buildPackages.buildPackages.haskell.compiler.ghc945
719710
or final.buildPackages.buildPackages.haskell.compiler.ghc944
720711
or final.buildPackages.buildPackages.haskell.compiler.ghc943;
@@ -736,10 +727,7 @@ in {
736727
bootPkgs = bootPkgsGhc94 // {
737728
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
738729
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc963
739-
else final.buildPackages.buildPackages.haskell.compiler.ghc966
740-
or final.buildPackages.buildPackages.haskell.compiler.ghc965
741-
or final.buildPackages.buildPackages.haskell.compiler.ghc964
742-
or final.buildPackages.buildPackages.haskell.compiler.ghc963
730+
else final.buildPackages.buildPackages.haskell.compiler.ghc963
743731
or final.buildPackages.buildPackages.haskell.compiler.ghc962
744732
or final.buildPackages.buildPackages.haskell.compiler.ghc945
745733
or final.buildPackages.buildPackages.haskell.compiler.ghc944
@@ -762,9 +750,7 @@ in {
762750
bootPkgs = bootPkgsGhc94 // {
763751
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
764752
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc964
765-
else final.buildPackages.buildPackages.haskell.compiler.ghc966
766-
or final.buildPackages.buildPackages.haskell.compiler.ghc965
767-
or final.buildPackages.buildPackages.haskell.compiler.ghc964
753+
else final.buildPackages.buildPackages.haskell.compiler.ghc964
768754
or final.buildPackages.buildPackages.haskell.compiler.ghc963
769755
or final.buildPackages.buildPackages.haskell.compiler.ghc962
770756
or final.buildPackages.buildPackages.haskell.compiler.ghc945

0 commit comments

Comments
 (0)