Skip to content

Commit a15ae51

Browse files
authored
fix: final.*Platform -> final.stdenv.*Platform. (#1878)
1 parent d3fd7ee commit a15ae51

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

overlays/bootstrap.nix

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ in {
206206
bootPkgs = bootPkgs // {
207207
# GHC 8.6.5 and earlier need happy 1.19.11
208208
happy = final.haskell-nix.bootstrap.packages.happy-old-unchecked;
209-
ghc = if final.buildPlatform != final.targetPlatform
209+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
210210
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc865
211211
else final.buildPackages.buildPackages.haskell.compiler.ghc865;
212212
};
@@ -228,7 +228,7 @@ in {
228228
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc881; };
229229

230230
bootPkgs = bootPkgs // {
231-
ghc = if final.buildPlatform != final.targetPlatform
231+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
232232
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc881
233233
else final.buildPackages.buildPackages.haskell.compiler.ghc884;
234234
};
@@ -249,7 +249,7 @@ in {
249249
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc882; };
250250

251251
bootPkgs = bootPkgs // {
252-
ghc = if final.buildPlatform != final.targetPlatform
252+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
253253
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc882
254254
else final.buildPackages.buildPackages.haskell.compiler.ghc884;
255255
};
@@ -270,7 +270,7 @@ in {
270270
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc883; };
271271

272272
bootPkgs = bootPkgs // {
273-
ghc = if final.buildPlatform != final.targetPlatform
273+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
274274
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc883
275275
else final.buildPackages.buildPackages.haskell.compiler.ghc884;
276276
};
@@ -312,7 +312,7 @@ in {
312312
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8101; };
313313

314314
bootPkgs = bootPkgs // {
315-
ghc = if final.buildPlatform != final.targetPlatform
315+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
316316
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc8101
317317
else final.buildPackages.buildPackages.haskell.compiler.ghc8107;
318318
};
@@ -333,7 +333,7 @@ in {
333333
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8102; };
334334

335335
bootPkgs = bootPkgs // {
336-
ghc = if final.buildPlatform != final.targetPlatform
336+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
337337
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc8102
338338
else final.buildPackages.buildPackages.haskell.compiler.ghc8107;
339339
};
@@ -354,7 +354,7 @@ in {
354354
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8103; };
355355

356356
bootPkgs = bootPkgs // {
357-
ghc = if final.buildPlatform != final.targetPlatform
357+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
358358
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc8103
359359
else final.buildPackages.buildPackages.haskell.compiler.ghc8107;
360360
};
@@ -375,7 +375,7 @@ in {
375375
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8104; };
376376

377377
bootPkgs = bootPkgs // {
378-
ghc = if final.buildPlatform != final.targetPlatform
378+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
379379
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc8104
380380
else final.buildPackages.buildPackages.haskell.compiler.ghc8107;
381381
};
@@ -396,7 +396,7 @@ in {
396396
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8105; };
397397

398398
bootPkgs = bootPkgs // {
399-
ghc = if final.buildPlatform != final.targetPlatform
399+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
400400
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc8105
401401
else final.buildPackages.buildPackages.haskell.compiler.ghc8107;
402402
};
@@ -417,7 +417,7 @@ in {
417417
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8106; };
418418

419419
bootPkgs = bootPkgs // {
420-
ghc = if final.buildPlatform != final.targetPlatform
420+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
421421
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc8106
422422
else final.buildPackages.buildPackages.haskell.compiler.ghc8107;
423423
};
@@ -438,7 +438,7 @@ in {
438438
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8107; };
439439

440440
bootPkgs = bootPkgs // {
441-
ghc = if final.buildPlatform != final.targetPlatform
441+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
442442
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc8107
443443
else final.buildPackages.buildPackages.haskell.compiler.ghc8107;
444444
};
@@ -459,7 +459,7 @@ in {
459459
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc901; };
460460

461461
bootPkgs = bootPkgs // {
462-
ghc = if final.buildPlatform != final.targetPlatform
462+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
463463
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc901
464464
else final.buildPackages.buildPackages.haskell.compiler.ghc902;
465465
};
@@ -480,7 +480,7 @@ in {
480480
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc902; };
481481

482482
bootPkgs = bootPkgs // {
483-
ghc = if final.buildPlatform != final.targetPlatform
483+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
484484
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc902
485485
else final.buildPackages.buildPackages.haskell.compiler.ghc902;
486486
};
@@ -733,7 +733,7 @@ in {
733733
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc96020230302; };
734734

735735
bootPkgs = bootPkgsGhc94 // {
736-
ghc = if final.buildPlatform != final.targetPlatform
736+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
737737
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc96020230302
738738
else final.buildPackages.buildPackages.haskell.compiler.ghc944
739739
or final.buildPackages.buildPackages.haskell.compiler.ghc943;
@@ -756,7 +756,7 @@ in {
756756
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc961; };
757757

758758
bootPkgs = bootPkgsGhc94 // {
759-
ghc = if final.buildPlatform != final.targetPlatform
759+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
760760
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc961
761761
else final.buildPackages.buildPackages.haskell.compiler.ghc944
762762
or final.buildPackages.buildPackages.haskell.compiler.ghc943;

0 commit comments

Comments
 (0)