Skip to content

Commit 2073200

Browse files
Fix benchmark build errors
9.2.5 and 8.10.7 had build errors when running benchmarks due to `mfsolve` test suite having duplicate instances, so stop building tests for mfsolve (see: kuribas/mfsolve#8). Also, `http2-4.0.0` has a parse error due to a misplaced haddock comment that causes build failure with `-haddock`. It is fixed in the latest commit of the source repo, so use that in the `cabal.project` for now.
1 parent 9d45637 commit 2073200

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

cabal.project

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ optional-packages: vendored/*/*.cabal
4444

4545
tests: True
4646

47+
-- mfsolve has duplicate instances in its test suite
48+
-- See: https://github.com/kuribas/mfsolve/issues/8
49+
package mfsolve
50+
tests: False
51+
4752
if impl(ghc >= 9.5)
4853
source-repository-package
4954
type:git
@@ -65,6 +70,14 @@ if impl(ghc >= 9.5)
6570
location: https://github.com/wz1000/ghc-exactprint/
6671
tag: 58d88820399b66304f3bb18f0b2602c3a90d5bea
6772

73+
-- Remove when fix for
74+
-- https://github.com/kazu-yamamoto/http2/issues/42
75+
-- is released on hackage
76+
source-repository-package
77+
type:git
78+
location: https://github.com/kazu-yamamoto/http2
79+
tag: aa56ded3494dd4f0efb0bbcb5378879ce785a647
80+
6881
package *
6982
ghc-options: -haddock
7083
test-show-details: direct

plugins/hls-eval-plugin/src/Ide/Plugin/Eval/Util.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ timed out name op = do
3939
_ <- out name (showDuration secs)
4040
return r
4141

42-
-- |Log using hie logger, reports source position of logging statement
42+
-- | Log using hie logger, reports source position of logging statement
4343
logWith :: (HasCallStack, MonadIO m, Show a1, Show a2) => IdeState -> a1 -> a2 -> m ()
4444
logWith state key val =
4545
liftIO . logPriority (ideLogger state) logLevel $

0 commit comments

Comments
 (0)