Skip to content

fix: final.*Platform -> final.stdenv.*Platform. #1878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2023
Merged

fix: final.*Platform -> final.stdenv.*Platform. #1878

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions overlays/bootstrap.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ in {
bootPkgs = bootPkgs // {
# GHC 8.6.5 and earlier need happy 1.19.11
happy = final.haskell-nix.bootstrap.packages.happy-old-unchecked;
ghc = if final.buildPlatform != final.targetPlatform
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc865
else final.buildPackages.buildPackages.haskell.compiler.ghc865;
};
Expand All @@ -228,7 +228,7 @@ in {
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc881; };

bootPkgs = bootPkgs // {
ghc = if final.buildPlatform != final.targetPlatform
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc881
else final.buildPackages.buildPackages.haskell.compiler.ghc884;
};
Expand All @@ -249,7 +249,7 @@ in {
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc882; };

bootPkgs = bootPkgs // {
ghc = if final.buildPlatform != final.targetPlatform
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc882
else final.buildPackages.buildPackages.haskell.compiler.ghc884;
};
Expand All @@ -270,7 +270,7 @@ in {
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc883; };

bootPkgs = bootPkgs // {
ghc = if final.buildPlatform != final.targetPlatform
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc883
else final.buildPackages.buildPackages.haskell.compiler.ghc884;
};
Expand Down Expand Up @@ -312,7 +312,7 @@ in {
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8101; };

bootPkgs = bootPkgs // {
ghc = if final.buildPlatform != final.targetPlatform
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc8101
else final.buildPackages.buildPackages.haskell.compiler.ghc8107;
};
Expand All @@ -333,7 +333,7 @@ in {
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8102; };

bootPkgs = bootPkgs // {
ghc = if final.buildPlatform != final.targetPlatform
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc8102
else final.buildPackages.buildPackages.haskell.compiler.ghc8107;
};
Expand All @@ -354,7 +354,7 @@ in {
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8103; };

bootPkgs = bootPkgs // {
ghc = if final.buildPlatform != final.targetPlatform
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc8103
else final.buildPackages.buildPackages.haskell.compiler.ghc8107;
};
Expand All @@ -375,7 +375,7 @@ in {
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8104; };

bootPkgs = bootPkgs // {
ghc = if final.buildPlatform != final.targetPlatform
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc8104
else final.buildPackages.buildPackages.haskell.compiler.ghc8107;
};
Expand All @@ -396,7 +396,7 @@ in {
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8105; };

bootPkgs = bootPkgs // {
ghc = if final.buildPlatform != final.targetPlatform
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc8105
else final.buildPackages.buildPackages.haskell.compiler.ghc8107;
};
Expand All @@ -417,7 +417,7 @@ in {
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8106; };

bootPkgs = bootPkgs // {
ghc = if final.buildPlatform != final.targetPlatform
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc8106
else final.buildPackages.buildPackages.haskell.compiler.ghc8107;
};
Expand All @@ -438,7 +438,7 @@ in {
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc8107; };

bootPkgs = bootPkgs // {
ghc = if final.buildPlatform != final.targetPlatform
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc8107
else final.buildPackages.buildPackages.haskell.compiler.ghc8107;
};
Expand All @@ -459,7 +459,7 @@ in {
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc901; };

bootPkgs = bootPkgs // {
ghc = if final.buildPlatform != final.targetPlatform
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc901
else final.buildPackages.buildPackages.haskell.compiler.ghc902;
};
Expand All @@ -480,7 +480,7 @@ in {
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc902; };

bootPkgs = bootPkgs // {
ghc = if final.buildPlatform != final.targetPlatform
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc902
else final.buildPackages.buildPackages.haskell.compiler.ghc902;
};
Expand Down Expand Up @@ -733,7 +733,7 @@ in {
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc96020230302; };

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

bootPkgs = bootPkgsGhc94 // {
ghc = if final.buildPlatform != final.targetPlatform
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc961
else final.buildPackages.buildPackages.haskell.compiler.ghc944
or final.buildPackages.buildPackages.haskell.compiler.ghc943;
Expand Down