From 6879eba497698a686b8a6ff469af28f3b2d9e06b Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Tue, 21 May 2024 13:07:07 +1000 Subject: [PATCH 1/2] Make it build with ghc-9.10 Only change required was a bump to upper bounds of base. --- .../binary-serialise-cbor.cabal | 2 +- cbor-tool/cbor-tool.cabal | 4 +-- cborg-json/cborg-json.cabal | 10 +++---- cborg/cborg.cabal | 6 ++-- serialise/serialise.cabal | 30 +++++++++---------- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/binary-serialise-cbor/binary-serialise-cbor.cabal b/binary-serialise-cbor/binary-serialise-cbor.cabal index ca51b60..180b585 100644 --- a/binary-serialise-cbor/binary-serialise-cbor.cabal +++ b/binary-serialise-cbor/binary-serialise-cbor.cabal @@ -51,7 +51,7 @@ library exposed-modules: Data.Binary.Serialise.CBOR.Read build-depends: - base >= 4.11 && < 4.20, + base >= 4.11 && < 4.21, bytestring < 1.0, cborg == 0.2.*, diff --git a/cbor-tool/cbor-tool.cabal b/cbor-tool/cbor-tool.cabal index ab63b95..e9ea1d3 100644 --- a/cbor-tool/cbor-tool.cabal +++ b/cbor-tool/cbor-tool.cabal @@ -29,8 +29,8 @@ executable cbor-tool other-extensions: CPP, BangPatterns ghc-options: -Wall build-depends: - base >=4.11 && <4.20, - filepath >=1.0 && <1.5, + base >=4.11 && <4.21, + filepath >=1.0 && <1.6, aeson >=0.7 && <2.3, aeson-pretty >=0.8 && <0.9, scientific >=0.3 && <0.4, diff --git a/cborg-json/cborg-json.cabal b/cborg-json/cborg-json.cabal index 2bbbf12..62b0590 100644 --- a/cborg-json/cborg-json.cabal +++ b/cborg-json/cborg-json.cabal @@ -30,7 +30,7 @@ library exposed-modules: Codec.CBOR.JSON ghc-options: -Wall build-depends: - base >=4.11 && < 4.20, + base >=4.11 && < 4.21, aeson >=0.7 && <2.3, aeson-pretty >=0.8 && <0.9, base64-bytestring >=1.0 && <1.3, @@ -61,11 +61,11 @@ benchmark bench other-modules: build-depends: - base >= 4.11 && < 4.20, + base >= 4.11 && < 4.21, bytestring >= 0.10.4 && < 0.13, criterion >= 1.0 && < 1.7, deepseq >= 1.0 && < 1.6, - zlib >= 0.5 && < 0.7, + zlib >= 0.5 && < 0.8, directory, process, aeson, @@ -87,14 +87,14 @@ test-suite tests other-modules: build-depends: - base >= 4.7 && < 4.20, + base >= 4.7 && < 4.21, base-orphans, base16-bytestring >= 1.0 && < 1.1, bytestring >= 0.10.4 && < 0.13, cborg, cborg-json, aeson >= 0.7 && < 2.3, - QuickCheck >= 2.9 && < 2.15, + QuickCheck >= 2.9 && < 2.16, tasty >= 0.11 && < 1.6, tasty-hunit >= 0.9 && < 0.11, text >= 1.1 && < 2.2 diff --git a/cborg/cborg.cabal b/cborg/cborg.cabal index 4ea6536..038b6fa 100644 --- a/cborg/cborg.cabal +++ b/cborg/cborg.cabal @@ -90,7 +90,7 @@ library build-depends: array >= 0.4 && < 0.6, - base >= 4.11 && < 4.20, + base >= 4.11 && < 4.21, bytestring >= 0.10.4 && < 0.13, containers >= 0.5 && < 0.8, deepseq >= 1.0 && < 1.6, @@ -148,7 +148,7 @@ test-suite tests build-depends: array >= 0.4 && < 0.6, - base >= 4.11 && < 4.20, + base >= 4.11 && < 4.21, base-orphans, bytestring >= 0.10.4 && < 0.13, text >= 1.1 && < 2.2, @@ -159,7 +159,7 @@ test-suite tests base16-bytestring >= 1.0 && < 1.1, deepseq >= 1.0 && < 1.6, half >= 0.2.2.3 && < 0.4, - QuickCheck >= 2.9 && < 2.15, + QuickCheck >= 2.9 && < 2.16, random, scientific >= 0.3 && < 0.4, tasty >= 0.11 && < 1.6, diff --git a/serialise/serialise.cabal b/serialise/serialise.cabal index eb58a8d..8c86caf 100644 --- a/serialise/serialise.cabal +++ b/serialise/serialise.cabal @@ -69,7 +69,7 @@ library Codec.Serialise.Internal.GeneralisedUTF8 build-depends: - base >= 4.11 && < 4.20, + base >= 4.11 && < 4.21, array >= 0.4 && < 0.6, bytestring >= 0.10.4 && < 0.13, cborg == 0.2.*, @@ -86,10 +86,10 @@ library if flag(newtime15) build-depends: - time >= 1.5 && < 1.14 + time >= 1.5 && < 1.15 else build-depends: - time >= 1.4 && < 1.5, + time >= 1.4 && < 1.6, old-locale if impl(ghc >= 8.0) @@ -124,18 +124,18 @@ test-suite tests Tests.GeneralisedUTF8 build-depends: - base >= 4.11 && < 4.20, + base >= 4.11 && < 4.21, bytestring >= 0.10.4 && < 0.13, directory >= 1.0 && < 1.4, - filepath >= 1.0 && < 1.5, + filepath >= 1.0 && < 1.6, text >= 1.1 && < 2.2, - time >= 1.4 && < 1.14, + time >= 1.4 && < 1.15, containers >= 0.5 && < 0.8, unordered-containers >= 0.2 && < 0.3, primitive >= 0.5 && < 0.10, cborg, serialise, - QuickCheck >= 2.9 && < 2.15, + QuickCheck >= 2.9 && < 2.16, tasty >= 0.11 && < 1.6, tasty-hunit >= 0.9 && < 0.11, tasty-quickcheck >= 0.8 && < 0.11, @@ -161,7 +161,7 @@ benchmark instances Instances.Time build-depends: - base >= 4.11 && < 4.20, + base >= 4.11 && < 4.21, binary >= 0.7 && < 0.11, bytestring >= 0.10.4 && < 0.13, vector >= 0.10 && < 0.14, @@ -173,7 +173,7 @@ benchmark instances if flag(newtime15) build-depends: - time >= 1.5 && < 1.14 + time >= 1.5 && < 1.15 else build-depends: time >= 1.4 && < 1.5, @@ -205,7 +205,7 @@ benchmark micro SimpleVersus build-depends: - base >= 4.11 && < 4.20, + base >= 4.11 && < 4.21, binary >= 0.7 && < 0.11, bytestring >= 0.10.4 && < 0.13, ghc-prim >= 0.3.1.0 && < 0.12, @@ -251,7 +251,7 @@ benchmark versus Macro.CBOR build-depends: - base >= 4.11 && < 4.20, + base >= 4.11 && < 4.21, array >= 0.4 && < 0.6, binary >= 0.7 && < 0.11, bytestring >= 0.10.4 && < 0.13, @@ -263,14 +263,14 @@ benchmark versus cborg, serialise, - filepath >= 1.0 && < 1.5, + filepath >= 1.0 && < 1.6, containers >= 0.5 && < 0.8, deepseq >= 1.0 && < 1.6, aeson >= 0.7 && < 2.3, cereal >= 0.5.2.0 && < 0.6, half >= 0.2.2.3 && < 0.4, - tar >= 0.4 && < 0.6, - zlib >= 0.5 && < 0.7, + tar >= 0.4 && < 0.7, + zlib >= 0.5 && < 0.8, pretty >= 1.0 && < 1.2, criterion >= 1.0 && < 1.7, store >= 0.7.1 && < 0.8, @@ -278,7 +278,7 @@ benchmark versus if flag(newtime15) build-depends: - time >= 1.5 && < 1.14 + time >= 1.5 && < 1.15 else build-depends: time >= 1.4 && < 1.5, From 01f32360e2a3945a76e36ed9989e586f55675286 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Tue, 21 May 2024 13:07:14 +1000 Subject: [PATCH 2/2] CI: Add ghc-9.10 to the build matrix --- .github/workflows/haskell-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 9d37dd4..c61a312 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -28,6 +28,11 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.10.1 + compilerKind: ghc + compilerVersion: 9.10.1 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.8.1 compilerKind: ghc compilerVersion: 9.8.1