Skip to content

Commit

Permalink
Merge pull request #855 from IntersectMBO/erikd/ghc-9.10
Browse files Browse the repository at this point in the history
Make it build with ghc 9.10
  • Loading branch information
erikd committed Aug 9, 2024
2 parents afdd769 + 8af70ec commit 3435070
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 67 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.6", "9.8"]
ghc: ["9.6", "9.8", "9.10"]
cabal: ["3.12"]
sys:
- { os: windows-latest, shell: 'C:/msys64/usr/bin/bash.exe -e {0}' }
Expand Down
4 changes: 2 additions & 2 deletions cabal.project
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-06-23T23:01:13Z
, cardano-haskell-packages 2024-07-19T12:00:49Z
, hackage.haskell.org 2024-08-08T19:27:29Z
, cardano-haskell-packages 2024-08-08T07:19:00Z

packages:
cardano-cli
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/cardano-cli.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ extra-source-files: README.md
common project-config
default-language: Haskell2010
default-extensions: OverloadedStrings
build-depends: base >=4.14 && <4.20
build-depends: base >=4.14 && <4.21
ghc-options:
-Wall
-Wcompat
Expand Down
3 changes: 1 addition & 2 deletions cardano-cli/src/Cardano/CLI/Run/Ping.hs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import Control.Monad.Class.MonadAsync (MonadAsync (async, wait, waitCa
import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (left)
import Control.Tracer (Tracer (..))
import Data.List (foldl')
import qualified Data.List as L
import qualified Data.List as List
import Network.Socket (AddrInfo)
Expand Down Expand Up @@ -91,7 +90,7 @@ runPingCmd options = do
liftIO $ wait laid

-- Collect errors 'es' from failed pings and 'addrs' from successful pings.
let (es, addrs) = foldl' partition ([], []) res
let (es, addrs) = L.foldl' partition ([], []) res

-- Report any errors
case (es, addrs) of
Expand Down
118 changes: 57 additions & 61 deletions flake.lock

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

0 comments on commit 3435070

Please sign in to comment.