Skip to content

Commit fccbbad

Browse files
tomberekhamishmack
authored andcommitted
fix: use ghc967 to bootstrap (25.11)
1 parent 558c588 commit fccbbad

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

overlays/bootstrap.nix

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -867,8 +867,9 @@ in {
867867

868868
bootPkgs = bootPkgsGhc94 // {
869869
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
870-
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc966
871-
else final.buildPackages.buildPackages.haskell.compiler.ghc966
870+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc967
871+
else final.buildPackages.buildPackages.haskell.compiler.ghc967
872+
or final.buildPackages.buildPackages.haskell.compiler.ghc966
872873
or final.buildPackages.buildPackages.haskell.compiler.ghc965
873874
or final.buildPackages.buildPackages.haskell.compiler.ghc964
874875
or final.buildPackages.buildPackages.haskell.compiler.ghc963
@@ -893,8 +894,9 @@ in {
893894

894895
bootPkgs = bootPkgsGhc94 // {
895896
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
896-
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc966
897-
else final.buildPackages.buildPackages.haskell.compiler.ghc966
897+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc967
898+
else final.buildPackages.buildPackages.haskell.compiler.ghc967
899+
or final.buildPackages.buildPackages.haskell.compiler.ghc966
898900
or final.buildPackages.buildPackages.haskell.compiler.ghc965
899901
or final.buildPackages.buildPackages.haskell.compiler.ghc964
900902
or final.buildPackages.buildPackages.haskell.compiler.ghc963
@@ -920,7 +922,8 @@ in {
920922
bootPkgs = bootPkgsGhc94 // {
921923
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
922924
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc983
923-
else final.buildPackages.buildPackages.haskell.compiler.ghc966
925+
else final.buildPackages.buildPackages.haskell.compiler.ghc967
926+
or final.buildPackages.buildPackages.haskell.compiler.ghc966
924927
or final.buildPackages.buildPackages.haskell.compiler.ghc965
925928
or final.buildPackages.buildPackages.haskell.compiler.ghc964
926929
or final.buildPackages.buildPackages.haskell.compiler.ghc963
@@ -946,7 +949,8 @@ in {
946949
bootPkgs = bootPkgsGhc94 // {
947950
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
948951
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc984
949-
else final.buildPackages.buildPackages.haskell.compiler.ghc966
952+
else final.buildPackages.buildPackages.haskell.compiler.ghc967
953+
or final.buildPackages.buildPackages.haskell.compiler.ghc966
950954
or final.buildPackages.buildPackages.haskell.compiler.ghc965
951955
or final.buildPackages.buildPackages.haskell.compiler.ghc964
952956
or final.buildPackages.buildPackages.haskell.compiler.ghc963
@@ -977,6 +981,7 @@ in {
977981
# or final.buildPackages.buildPackages.haskell.compiler.ghc983
978982
final.buildPackages.buildPackages.haskell.compiler.ghc982
979983
or final.buildPackages.buildPackages.haskell.compiler.ghc981
984+
or final.buildPackages.buildPackages.haskell.compiler.ghc967
980985
or final.buildPackages.buildPackages.haskell.compiler.ghc966
981986
or final.buildPackages.buildPackages.haskell.compiler.ghc965
982987
or final.buildPackages.buildPackages.haskell.compiler.ghc964
@@ -1008,6 +1013,7 @@ in {
10081013
# or final.buildPackages.buildPackages.haskell.compiler.ghc983
10091014
final.buildPackages.buildPackages.haskell.compiler.ghc982
10101015
or final.buildPackages.buildPackages.haskell.compiler.ghc981
1016+
or final.buildPackages.buildPackages.haskell.compiler.ghc967
10111017
or final.buildPackages.buildPackages.haskell.compiler.ghc966
10121018
or final.buildPackages.buildPackages.haskell.compiler.ghc965
10131019
or final.buildPackages.buildPackages.haskell.compiler.ghc964
@@ -1040,6 +1046,7 @@ in {
10401046
or final.buildPackages.buildPackages.haskell.compiler.ghc983
10411047
or final.buildPackages.buildPackages.haskell.compiler.ghc982
10421048
or final.buildPackages.buildPackages.haskell.compiler.ghc981
1049+
or final.buildPackages.buildPackages.haskell.compiler.ghc967
10431050
or final.buildPackages.buildPackages.haskell.compiler.ghc966
10441051
or final.buildPackages.buildPackages.haskell.compiler.ghc965
10451052
or final.buildPackages.buildPackages.haskell.compiler.ghc964
@@ -1073,6 +1080,7 @@ in {
10731080
or final.buildPackages.buildPackages.haskell.compiler.ghc983
10741081
or final.buildPackages.buildPackages.haskell.compiler.ghc982
10751082
or final.buildPackages.buildPackages.haskell.compiler.ghc981
1083+
or final.buildPackages.buildPackages.haskell.compiler.ghc967
10761084
or final.buildPackages.buildPackages.haskell.compiler.ghc966
10771085
or final.buildPackages.buildPackages.haskell.compiler.ghc965
10781086
or final.buildPackages.buildPackages.haskell.compiler.ghc964
@@ -1114,6 +1122,7 @@ in {
11141122
or final.buildPackages.buildPackages.haskell.compiler.ghc983
11151123
or final.buildPackages.buildPackages.haskell.compiler.ghc982
11161124
or final.buildPackages.buildPackages.haskell.compiler.ghc981
1125+
or final.buildPackages.buildPackages.haskell.compiler.ghc967
11171126
or final.buildPackages.buildPackages.haskell.compiler.ghc966
11181127
or final.buildPackages.buildPackages.haskell.compiler.ghc965
11191128
or final.buildPackages.buildPackages.haskell.compiler.ghc964
@@ -1138,8 +1147,9 @@ in {
11381147
} // final.lib.optionalAttrs (builtins.compareVersions version "9.7" <0) {
11391148
bootPkgs = bootPkgsGhc94 // {
11401149
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
1141-
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc966
1142-
else final.buildPackages.buildPackages.haskell.compiler.ghc966
1150+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc967
1151+
else final.buildPackages.buildPackages.haskell.compiler.ghc967
1152+
or final.buildPackages.buildPackages.haskell.compiler.ghc966
11431153
or final.buildPackages.buildPackages.haskell.compiler.ghc965
11441154
or final.buildPackages.buildPackages.haskell.compiler.ghc964
11451155
or final.buildPackages.buildPackages.haskell.compiler.ghc963

0 commit comments

Comments
 (0)