Skip to content

Make it build with ghc-9.10 #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 7, 2024
Merged

Make it build with ghc-9.10 #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4ddff4
Make it build with ghc-9.10
erikd Aug 7, 2024
9553558
iohk-monitoring: Bump cabal version
erikd Aug 7, 2024
122448b
CI: Add ghc-9.10 to the build matrix
erikd Aug 7, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/haskell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["8.10.7", "9.6.4", "9.8.1"]
os: [ubuntu-latest, macos-latest, windows-latest]
ghc: ["8.10.7", "9.6", "9.8", "9.10"]
os: [ubuntu-latest, macos-13, windows-latest]

env:
# Modify this value to "invalidate" the cabal cache.
Expand Down
4 changes: 2 additions & 2 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ repository cardano-haskell-packages
-- See CONTRIBUTING for information about these, including some Nix commands
-- you need to run if you change them
index-state:
, hackage.haskell.org 2024-02-04T19:30:42Z
, cardano-haskell-packages 2024-01-31T18:47:21Z
, hackage.haskell.org 2024-08-06T18:13:50Z
, cardano-haskell-packages 2024-08-06T02:29:22Z

packages:
contra-tracer
Expand Down
2 changes: 1 addition & 1 deletion iohk-monitoring/iohk-monitoring.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: iohk-monitoring
version: 0.1.11.4
version: 0.1.11.5
synopsis: logging, benchmarking and monitoring framework
-- description:
license: Apache-2.0
Expand Down
4 changes: 2 additions & 2 deletions iohk-monitoring/src/Cardano/BM/Data/LogItem.lhs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import Data.Aeson (FromJSON (..), ToJSON (..), Value (..), (.=),
(.:), object, withText, withObject)
import Data.Aeson.Types (Object, Parser)
import Data.Function (on)
import Data.List (foldl')
import Data.List as List (foldl')
import Data.Maybe (fromMaybe)
import qualified Data.Text as T
import Data.Text (Text, pack, stripPrefix)
Expand Down Expand Up @@ -401,5 +401,5 @@ loContentEq = (==) `on` loContent
\label{code:loname2text}\index{loname2text}
\begin{code}
loname2text :: [LoggerName] -> Text
loname2text nms = T.init $ foldl' (\el acc -> acc <> "." <> el) "" nms
loname2text nms = T.init $ List.foldl' (\el acc -> acc <> "." <> el) "" nms
\end{code}
2 changes: 1 addition & 1 deletion plugins/backend-editor/lobemo-backend-editor.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ library
safe-exceptions,
text,
time,
threepenny-gui,
threepenny-gui >= 0.9,
unordered-containers
if os(windows)
build-depends: Win32
Expand Down
Loading