Skip to content
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

Jump to bottom

Make it build with ghc 9.10 #855

Merged
merged 3 commits into from
Aug 9, 2024
Merged

Make it build with ghc 9.10 #855

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
bc28706
Make it build with ghc-9.10
erikd Aug 8, 2024
d13843c
CI: Add ghc 9.10 to the build matrix
erikd Aug 8, 2024
8af70ec
Nix updates
erikd Aug 6, 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
2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
View file
Open in desktop
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"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If our next GHC target after 8.10 is 9.6, I'm wondering if we need both 9.8 and 9.10 here?

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
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-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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

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

Loading