Skip to content

Commit 0e0ac53

Browse files
committed
At least it works in nix on 9.4
1 parent 6c0b40f commit 0e0ac53

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

configuration-ghc-94.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ let
1818
# https://github.com/nikita-volkov/ptr-poker/issues/11
1919
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
2020

21+
# Freezes in test for some reason.
2122
ghc-exactprint =
22-
hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-160 { };
23+
dontCheck (hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-160 { });
2324
# Hlint is still broken
2425
hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint { });
2526

@@ -28,7 +29,9 @@ let
2829
# Re-generate HLS drv excluding some plugins
2930
haskell-language-server =
3031
hself.callCabal2nixWithOptions "haskell-language-server" ./.
31-
(pkgs.lib.concatStringsSep " " [ "-fpedantic" "-f-hlint" ]) { };
32+
# Pedantic cannot be used due to -Werror=unused-top-binds
33+
# Check must be disabled due to some missing required files
34+
(pkgs.lib.concatStringsSep " " [ "--no-check" "-f-pedantic" "-f-hlint" ]) { };
3235
});
3336
in {
3437
inherit disabledPlugins;

plugins/hls-cabal-plugin/hls-cabal-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ library
4545
-- This is a lot of work for almost zero benefit, so we just allow more versions here
4646
-- and we eventually completely drop support for building HLS with stack.
4747
, Cabal ^>=3.2 || ^>=3.4 || ^>=3.6 || ^>= 3.8
48-
, Cabal-syntax ^>= 3.6
48+
, Cabal-syntax ^>= 3.6 || ^>= 3.8
4949
, deepseq
5050
, directory
5151
, extra >=1.7.4

0 commit comments

Comments
 (0)