Merge pull request #1073 from haskell/ghc-9.8

Ghc 9.8

Author: phadej

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.17.20230929
+# version: 0.17.20231004
 #
-# REGENDATA ("0.17.20230929",["github","cabal.project"])
+# REGENDATA ("0.17.20231004",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -32,14 +32,19 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.6.2
+          - compiler: ghc-9.8.0.20230929
             compilerKind: ghc
-            compilerVersion: 9.6.2
+            compilerVersion: 9.8.0.20230929
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.4.5
+          - compiler: ghc-9.6.3
             compilerKind: ghc
-            compilerVersion: 9.4.5
+            compilerVersion: 9.6.3
+            setup-method: ghcup
+            allow-failure: false
+          - compiler: ghc-9.4.7
+            compilerKind: ghc
+            compilerVersion: 9.4.7
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.2.8
@@ -87,6 +92,7 @@ jobs:
             mkdir -p "$HOME/.ghcup/bin"
             curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
             chmod a+x "$HOME/.ghcup/bin/ghcup"
+            "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
             "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
             "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           else
@@ -96,6 +102,7 @@ jobs:
             mkdir -p "$HOME/.ghcup/bin"
             curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
             chmod a+x "$HOME/.ghcup/bin/ghcup"
+            "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
             "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           fi
         env:
@@ -265,6 +272,8 @@ jobs:
           echo "    ghc-options: -Werror=missing-methods" >> cabal.project
           cat >> cabal.project <<EOF
           allow-newer: hermes-json:attoparsec-iso8601
+          allow-newer: network-uri:deepseq
+          allow-newer: attoparsec:ghc-prim
           EOF
           $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(aeson|aeson-benchmarks|aeson-examples|attoparsec-aeson|attoparsec-iso8601|text-iso8601)$/; }' >> cabal.project.local
           cat cabal.project

aeson.cabal

@@ -18,8 +18,9 @@ tested-with:
    || ==8.10.7
    || ==9.0.2
    || ==9.2.8
-   || ==9.4.5
-   || ==9.6.2
+   || ==9.4.7
+   || ==9.6.3
+   || ==9.8.1
 
 synopsis:           Fast JSON parsing and encoding
 cabal-version:      1.12
@@ -95,13 +96,13 @@ library
   -- GHC bundled libs
   build-depends:
       base              >=4.10.0.0 && <5
-    , bytestring        >=0.10.8.2 && <0.12
+    , bytestring        >=0.10.8.2 && <0.13
     , containers        >=0.5.10.2 && <0.7
-    , deepseq           >=1.4.3.0  && <1.5
+    , deepseq           >=1.4.3.0  && <1.6
     , exceptions        >=0.10.4   && <0.11
-    , ghc-prim          >=0.5.0.0  && <0.11
-    , template-haskell  >=2.12.0.0 && <2.21
-    , text              >=1.2.3.0  && <1.3  || >=2.0 && <2.1
+    , ghc-prim          >=0.5.0.0  && <0.12
+    , template-haskell  >=2.12.0.0 && <2.22
+    , text              >=1.2.3.0  && <1.3  || >=2.0 && <2.2
     , time              >=1.8.0.2  && <1.13
 
   -- Compat
@@ -133,7 +134,7 @@ library
     , tagged                >=0.8.7    && <0.9
     , text-iso8601          >=0.1      && <0.2
     , text-short            >=0.1.5    && <0.2
-    , th-abstraction        >=0.5.0.0  && <0.6
+    , th-abstraction        >=0.5.0.0  && <0.7
     , these                 >=1.2      && <1.3
     , unordered-containers  >=0.2.10.0 && <0.3
     , uuid-types            >=1.0.5    && <1.1

attoparsec-aeson/attoparsec-aeson.cabal

@@ -1,6 +1,7 @@
 cabal-version: 1.12
 name:          attoparsec-aeson
 version:       2.2.0.0
+x-revision:    1
 synopsis:      Parsing of aeson's Value with attoparsec
 description:
   Parsing of aeson's Value with attoparsec, originally from aeson.
@@ -26,8 +27,9 @@ tested-with:
    || ==8.10.7
    || ==9.0.2
    || ==9.2.8
-   || ==9.4.5
-   || ==9.6.2
+   || ==9.4.7
+   || ==9.6.3
+   || ==9.8.1
 
 library
   hs-source-dirs:   src
@@ -46,11 +48,11 @@ library
       aeson               >=2.2.0.0  && <2.3
     , attoparsec          >=0.14.2   && <0.15
     , base                >=4.10.0.0 && <5
-    , bytestring          >=0.10.8.2 && <0.12
+    , bytestring          >=0.10.8.2 && <0.13
     , integer-conversion  >=0.1      && <0.2
     , primitive           >=0.8.0.0  && <0.9
     , scientific          >=0.3.7.0  && <0.4
-    , text                >=1.2.3.0  && <1.3  || >=2.0 && <2.1
+    , text                >=1.2.3.0  && <1.3  || >=2.0 && <2.2
     , vector              >=0.12.0.1 && <0.14
 
 source-repository head

attoparsec-iso8601/attoparsec-iso8601.cabal

@@ -24,8 +24,9 @@ tested-with:
    || ==8.10.7
    || ==9.0.2
    || ==9.2.8
-   || ==9.4.5
-   || ==9.6.2
+   || ==9.4.7
+   || ==9.6.3
+   || ==9.8.1
 
 extra-source-files:
   changelog.md
@@ -43,7 +44,7 @@ library
       attoparsec          >=0.14.2   && <0.15
     , base                >=4.10.0.0 && <5
     , integer-conversion  >=0.1      && <0.2
-    , text                >=1.2.3.0  && <1.3.0.0 || >=2.0 && <2.1
+    , text                >=1.2.3.0  && <1.3.0.0 || >=2.0 && <2.2
     , time                >=1.6.0.1  && <1.13
     , time-compat         >=1.9.4    && <1.10
 

benchmarks/aeson-benchmarks.cabal

@@ -10,8 +10,9 @@ tested-with:
    || ==8.10.7
    || ==9.0.2
    || ==9.2.8
-   || ==9.4.5
-   || ==9.6.2
+   || ==9.4.7
+   || ==9.6.3
+   || ==9.8.1
 
 flag tasty-bench
   description: Use tasty-bench, otherwise criterion

cabal.haskell-ci

@@ -1,6 +1,7 @@
 branches: master
 cabal-check: False
 docspec: True
+head-hackage: False
 
 -- due hermes-json depending on attoparsec-iso8601
 install-dependencies: False

cabal.project

@@ -12,3 +12,9 @@ allow-newer: hermes-json:attoparsec-iso8601
 
 -- packages: https://hackage.haskell.org/package/libperf-0.1/candidate/libperf-0.1.tar.gz
 -- packages: https://hackage.haskell.org/package/tasty-perfbench-0.1/candidate/tasty-perfbench-0.1.tar.gz
+
+-- https://github.com/haskell/network-uri
+allow-newer: network-uri:deepseq
+
+-- https://github.com/haskell/attoparsec/issues/223
+allow-newer: attoparsec:ghc-prim

examples/aeson-examples.cabal

@@ -16,8 +16,9 @@ tested-with:
    || ==8.10.7
    || ==9.0.2
    || ==9.2.8
-   || ==9.4.5
-   || ==9.6.2
+   || ==9.4.7
+   || ==9.6.3
+   || ==9.8.1
 
 library twitter-generic
   default-language: Haskell2010

src/Data/Aeson/Internal/Text.hs

@@ -8,7 +8,7 @@ import           Data.ByteString                (ByteString)
 import qualified Data.Text                      as T
 
 #if MIN_VERSION_text(2,0,0)
-import           Data.Text.Array                (Array (..))
+import qualified Data.Text.Array                as A
 import qualified Data.Text.Internal             as T (Text (..))
 
 import qualified Data.ByteString.Short.Internal as SBS
@@ -27,7 +27,7 @@ unsafeDecodeASCII :: ByteString -> T.Text
 
 #if MIN_VERSION_text(2,0,0)
 unsafeDecodeASCII bs = withBS bs $ \_fp len -> if len == 0 then T.empty else
-  let !(SBS.SBS arr) = SBS.toShort bs in T.Text (ByteArray arr) 0 len
+  let !(SBS.SBS arr) = SBS.toShort bs in T.Text (A.ByteArray arr) 0 len
 
 #else
 unsafeDecodeASCII = TE.decodeLatin1

text-iso8601/text-iso8601.cabal

@@ -1,6 +1,7 @@
 cabal-version:      1.12
 name:               text-iso8601
 version:            0.1
+x-revision:         1
 synopsis:           Converting time to and from ISO 8601 text.
 description:
   Converting time to and from IS0 8601 text.
@@ -25,8 +26,9 @@ tested-with:
    || ==8.10.7
    || ==9.0.2
    || ==9.2.8
-   || ==9.4.5
-   || ==9.6.2
+   || ==9.4.7
+   || ==9.6.3
+   || ==9.8.1
 
 extra-source-files: changelog.md
 
@@ -46,7 +48,7 @@ library
   build-depends:
       base                >=4.10.0.0 && <5
     , integer-conversion  >=0.1      && <0.2
-    , text                >=1.2.3.0  && <1.3.0.0 || >=2.0 && <2.1
+    , text                >=1.2.3.0  && <1.3.0.0 || >=2.0 && <2.2
     , time                >=1.6.0.1  && <1.13
     , time-compat         >=1.9.4    && <1.10
 
@@ -66,7 +68,7 @@ test-suite text-iso8601-tests
   build-depends:
       QuickCheck            >=2.14.3   && <2.15
     , quickcheck-instances  >=0.3.29.1 && <0.4
-    , tasty                 >=1.4.3    && <1.5
+    , tasty                 >=1.4.3    && <1.6
     , tasty-hunit           >=0.10.0.3 && <0.11
     , tasty-quickcheck      >=0.10.2   && <0.11