Skip to content

Commit 60b1ce9

Browse files
authored
Merge pull request #648 from input-output-hk/erikd/ghc-9.10
Make it build with ghc-9.10
2 parents cb7bc03 + 122448b commit 60b1ce9

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.github/workflows/haskell.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
ghc: ["8.10.7", "9.6.4", "9.8.1"]
15-
os: [ubuntu-latest, macos-latest, windows-latest]
14+
ghc: ["8.10.7", "9.6", "9.8", "9.10"]
15+
os: [ubuntu-latest, macos-13, windows-latest]
1616

1717
env:
1818
# Modify this value to "invalidate" the cabal cache.

cabal.project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ repository cardano-haskell-packages
1313
-- See CONTRIBUTING for information about these, including some Nix commands
1414
-- you need to run if you change them
1515
index-state:
16-
, hackage.haskell.org 2024-02-04T19:30:42Z
17-
, cardano-haskell-packages 2024-01-31T18:47:21Z
16+
, hackage.haskell.org 2024-08-06T18:13:50Z
17+
, cardano-haskell-packages 2024-08-06T02:29:22Z
1818

1919
packages:
2020
contra-tracer

iohk-monitoring/iohk-monitoring.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: iohk-monitoring
2-
version: 0.1.11.4
2+
version: 0.1.11.5
33
synopsis: logging, benchmarking and monitoring framework
44
-- description:
55
license: Apache-2.0

iohk-monitoring/src/Cardano/BM/Data/LogItem.lhs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import Data.Aeson (FromJSON (..), ToJSON (..), Value (..), (.=),
3636
(.:), object, withText, withObject)
3737
import Data.Aeson.Types (Object, Parser)
3838
import Data.Function (on)
39-
import Data.List (foldl')
39+
import Data.List as List (foldl')
4040
import Data.Maybe (fromMaybe)
4141
import qualified Data.Text as T
4242
import Data.Text (Text, pack, stripPrefix)
@@ -401,5 +401,5 @@ loContentEq = (==) `on` loContent
401401
\label{code:loname2text}\index{loname2text}
402402
\begin{code}
403403
loname2text :: [LoggerName] -> Text
404-
loname2text nms = T.init $ foldl' (\el acc -> acc <> "." <> el) "" nms
404+
loname2text nms = T.init $ List.foldl' (\el acc -> acc <> "." <> el) "" nms
405405
\end{code}

plugins/backend-editor/lobemo-backend-editor.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ library
3030
safe-exceptions,
3131
text,
3232
time,
33-
threepenny-gui,
33+
threepenny-gui >= 0.9,
3434
unordered-containers
3535
if os(windows)
3636
build-depends: Win32

0 commit comments

Comments
 (0)