Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/call-cabal-project-to-nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ let
#
# > The option `packages.Win32.package.identifier.name' is used but not defined.
#
(compilerSelection pkgs)."${compiler-nix-name}";
(compilerSelection pkgs.buildPackages)."${compiler-nix-name}";

in let
ghc = if ghc' ? latestVersion
Expand Down
26 changes: 18 additions & 8 deletions overlays/bootstrap.nix
Original file line number Diff line number Diff line change
Expand Up @@ -867,8 +867,9 @@ in {

bootPkgs = bootPkgsGhc94 // {
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc966
else final.buildPackages.buildPackages.haskell.compiler.ghc966
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc967
else final.buildPackages.buildPackages.haskell.compiler.ghc967
or final.buildPackages.buildPackages.haskell.compiler.ghc966
or final.buildPackages.buildPackages.haskell.compiler.ghc965
or final.buildPackages.buildPackages.haskell.compiler.ghc964
or final.buildPackages.buildPackages.haskell.compiler.ghc963
Expand All @@ -893,8 +894,9 @@ in {

bootPkgs = bootPkgsGhc94 // {
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc966
else final.buildPackages.buildPackages.haskell.compiler.ghc966
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc967
else final.buildPackages.buildPackages.haskell.compiler.ghc967
or final.buildPackages.buildPackages.haskell.compiler.ghc966
or final.buildPackages.buildPackages.haskell.compiler.ghc965
or final.buildPackages.buildPackages.haskell.compiler.ghc964
or final.buildPackages.buildPackages.haskell.compiler.ghc963
Expand All @@ -920,7 +922,8 @@ in {
bootPkgs = bootPkgsGhc94 // {
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc983
else final.buildPackages.buildPackages.haskell.compiler.ghc966
else final.buildPackages.buildPackages.haskell.compiler.ghc967
or final.buildPackages.buildPackages.haskell.compiler.ghc966
or final.buildPackages.buildPackages.haskell.compiler.ghc965
or final.buildPackages.buildPackages.haskell.compiler.ghc964
or final.buildPackages.buildPackages.haskell.compiler.ghc963
Expand All @@ -946,7 +949,8 @@ in {
bootPkgs = bootPkgsGhc94 // {
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc984
else final.buildPackages.buildPackages.haskell.compiler.ghc966
else final.buildPackages.buildPackages.haskell.compiler.ghc967
or final.buildPackages.buildPackages.haskell.compiler.ghc966
or final.buildPackages.buildPackages.haskell.compiler.ghc965
or final.buildPackages.buildPackages.haskell.compiler.ghc964
or final.buildPackages.buildPackages.haskell.compiler.ghc963
Expand Down Expand Up @@ -977,6 +981,7 @@ in {
# or final.buildPackages.buildPackages.haskell.compiler.ghc983
final.buildPackages.buildPackages.haskell.compiler.ghc982
or final.buildPackages.buildPackages.haskell.compiler.ghc981
or final.buildPackages.buildPackages.haskell.compiler.ghc967
or final.buildPackages.buildPackages.haskell.compiler.ghc966
or final.buildPackages.buildPackages.haskell.compiler.ghc965
or final.buildPackages.buildPackages.haskell.compiler.ghc964
Expand Down Expand Up @@ -1008,6 +1013,7 @@ in {
# or final.buildPackages.buildPackages.haskell.compiler.ghc983
final.buildPackages.buildPackages.haskell.compiler.ghc982
or final.buildPackages.buildPackages.haskell.compiler.ghc981
or final.buildPackages.buildPackages.haskell.compiler.ghc967
or final.buildPackages.buildPackages.haskell.compiler.ghc966
or final.buildPackages.buildPackages.haskell.compiler.ghc965
or final.buildPackages.buildPackages.haskell.compiler.ghc964
Expand Down Expand Up @@ -1040,6 +1046,7 @@ in {
or final.buildPackages.buildPackages.haskell.compiler.ghc983
or final.buildPackages.buildPackages.haskell.compiler.ghc982
or final.buildPackages.buildPackages.haskell.compiler.ghc981
or final.buildPackages.buildPackages.haskell.compiler.ghc967
or final.buildPackages.buildPackages.haskell.compiler.ghc966
or final.buildPackages.buildPackages.haskell.compiler.ghc965
or final.buildPackages.buildPackages.haskell.compiler.ghc964
Expand Down Expand Up @@ -1073,6 +1080,7 @@ in {
or final.buildPackages.buildPackages.haskell.compiler.ghc983
or final.buildPackages.buildPackages.haskell.compiler.ghc982
or final.buildPackages.buildPackages.haskell.compiler.ghc981
or final.buildPackages.buildPackages.haskell.compiler.ghc967
or final.buildPackages.buildPackages.haskell.compiler.ghc966
or final.buildPackages.buildPackages.haskell.compiler.ghc965
or final.buildPackages.buildPackages.haskell.compiler.ghc964
Expand Down Expand Up @@ -1114,6 +1122,7 @@ in {
or final.buildPackages.buildPackages.haskell.compiler.ghc983
or final.buildPackages.buildPackages.haskell.compiler.ghc982
or final.buildPackages.buildPackages.haskell.compiler.ghc981
or final.buildPackages.buildPackages.haskell.compiler.ghc967
or final.buildPackages.buildPackages.haskell.compiler.ghc966
or final.buildPackages.buildPackages.haskell.compiler.ghc965
or final.buildPackages.buildPackages.haskell.compiler.ghc964
Expand All @@ -1138,8 +1147,9 @@ in {
} // final.lib.optionalAttrs (builtins.compareVersions version "9.7" <0) {
bootPkgs = bootPkgsGhc94 // {
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc966
else final.buildPackages.buildPackages.haskell.compiler.ghc966
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc967
else final.buildPackages.buildPackages.haskell.compiler.ghc967
or final.buildPackages.buildPackages.haskell.compiler.ghc966
or final.buildPackages.buildPackages.haskell.compiler.ghc965
or final.buildPackages.buildPackages.haskell.compiler.ghc964
or final.buildPackages.buildPackages.haskell.compiler.ghc963
Expand Down
Loading