Skip to content

Commit

Permalink
Fixing the last couple build failures
Browse files Browse the repository at this point in the history
  • Loading branch information
sellout committed Aug 25, 2024
1 parent 1f9d943 commit 5baa38c
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
15 changes: 12 additions & 3 deletions .config/project/github-ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ githubSystems: haskellPackages: {
}: let
planName = "plan-\${{ matrix.os }}-\${{ matrix.ghc }}\${{ matrix.bounds }}";
## NB: Prefer the default compiler version.
ghc-version = "9.6.3";
ghc-version = "9.6.5";
## This should be the highest GHC version that this workflow built.
latest-ghc-version = "9.10.1";
cabal-version = "3.12.1.0";
runs-on = "ubuntu-22.04";
in {
Expand Down Expand Up @@ -40,6 +42,12 @@ in {
ghc = "8.6.1";
os = "macos-13";
}
## TODO: For some reason, this combination fails to build
## ghc-paths-0.1.0.12.
{
ghc = "9.4.1";
os = "macos-14";
}
]
## GitHub can’t install GHC older than 9.4 on macos-14.
++ map (ghc: {
Expand Down Expand Up @@ -161,7 +169,8 @@ in {
id = "setup-haskell-cabal";
"with" = {inherit cabal-version ghc-version;};
}
{run = "cabal install cabal-plan -flicense-report";}
## The `-Wwarn` offsets an issue where warnings are causing failures.
{run = "cabal install cabal-plan -flicense-report --ghc-option=-Wwarn";}
{
name = "download Cabal plans";
uses = "actions/download-artifact@v4";
Expand All @@ -174,7 +183,7 @@ in {
{
run = ''
mkdir -p dist-newstyle/cache
mv plans/plan-''${{ matrix.os }}-${ghc-version}.json dist-newstyle/cache/plan.json
mv plans/plan-${runs-on}-${latest-ghc-version}.json dist-newstyle/cache/plan.json
'';
}
{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml

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

10 changes: 8 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@
nixpkgs.lib.versionAtLeast hprev.ghc.version "9.2.0"
&& final.system == "i686-linux"
then {
aeson = final.haskell.lib.dontCheck hprev.aeson;
enummapset = final.haskell.lib.dontCheck hprev.enummapset;
## Tests run out of memory (at least on garnix)
generic-arbitrary =
Expand Down Expand Up @@ -411,9 +412,14 @@
cabalPackages
(hpkgs:
[self.projectConfigurations.${system}.packages.path]
## NB: Haskell Language Server no longer supports GHC <9.2.
## NB: Haskell Language Server no longer supports GHC <9.2, and 9.4
## has an issue with it on i686-linux.
++ nixpkgs.lib.optional
(nixpkgs.lib.versionAtLeast hpkgs.ghc.version "9.2")
(
if system == "i686-linux"
then nixpkgs.lib.versionAtLeast hpkgs.ghc.version "9.4"
else nixpkgs.lib.versionAtLeast hpkgs.ghc.version "9.2"
)
hpkgs.haskell-language-server);

projectConfigurations =
Expand Down

0 comments on commit 5baa38c

Please sign in to comment.