Merge pull request #594 from IntersectMBO/erikd/ghc-9.8

Make it build with ghc-9.8

.github/workflows/haskell.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         # If you edit these versions, make sure the version in the lonely macos-latest job below is updated accordingly
-        ghc: ["9.6.4"]
+        ghc: ["9.6.4", "9.8.1"]
         cabal: ["3.10.2.1"]
         os: [windows-latest, ubuntu-latest]
         include:

cabal.project

@@ -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-06T15:14:59Z
-  , cardano-haskell-packages 2024-02-06T15:25:20Z
+  , hackage.haskell.org 2024-02-06T21:51:39Z
+  , cardano-haskell-packages 2024-02-07T07:51:35Z
 
 packages:
   cardano-cli

cardano-cli/cardano-cli.cabal

@@ -19,7 +19,7 @@ common project-config
   default-language:     Haskell2010
 
   default-extensions:   OverloadedStrings
-  build-depends:        base >= 4.14 && < 4.19
+  build-depends:        base >= 4.14 && < 4.20
 
   ghc-options:          -Wall
                         -Wcompat
@@ -227,9 +227,9 @@ library
                       , microlens
                       , network
                       , optparse-applicative-fork
-                      , ouroboros-consensus >= 0.13
-                      , ouroboros-consensus-cardano >= 0.11
-                      , ouroboros-consensus-protocol >= 0.6.0.0
+                      , ouroboros-consensus >= 0.15
+                      , ouroboros-consensus-cardano >= 0.13
+                      , ouroboros-consensus-protocol >= 0.7
                       , ouroboros-network-api
                       , ouroboros-network-protocols
                       , parsec
@@ -345,7 +345,7 @@ test-suite cardano-cli-golden
                       , directory
                       , extra
                       , filepath
-                      , hedgehog ^>= 1.3
+                      , hedgehog ^>= 1.4
                       , hedgehog-extras ^>= 0.6.0.1
                       , regex-compat
                       , regex-tdfa

cardano-cli/src/Cardano/CLI/Parser.hs

@@ -114,7 +114,7 @@ readerFromAttoParser p =
 eDNSName :: String -> Either String ByteString
 eDNSName str =
   -- We're using 'Shelley.textToDns' to validate the string.
-  let dnsNameText = Text.pack str
-  in case Shelley.textToDns (Text.length dnsNameText) dnsNameText of
-      Nothing -> Left $ "DNS name is more than 64 bytes: " <> str
-      Just dnsName -> Right . Text.encodeUtf8 . Shelley.dnsToText $ dnsName
+  -- The limit in the Conway CDDL spec is 128.
+  case Shelley.textToDns 128 (Text.pack str) of
+    Nothing -> Left $ "DNS name is more than 64 bytes: " <> str
+    Just dnsName -> Right . Text.encodeUtf8 . Shelley.dnsToText $ dnsName

cardano-cli/src/Cardano/CLI/Types/Common.hs

@@ -88,7 +88,7 @@ import qualified Cardano.Chain.Slotting as Byron
 import qualified Cardano.Ledger.BaseTypes as L
 import qualified Cardano.Ledger.Crypto as Crypto
 import qualified Cardano.Ledger.SafeHash as L
-import           Cardano.Ledger.Shelley.API (PoolParams (..))
+import           Cardano.Ledger.PoolParams (PoolParams (..))
 
 import           Data.Aeson (FromJSON (..), ToJSON (..), object, pairs, (.=))
 import qualified Data.Aeson as Aeson