Add GHC 9.2, bump bounds, fix syntax

haskell · Feb 8, 2022 · 1d98686 · 1d98686
1 parent 705398e
commit 1d98686
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -14,8 +14,9 @@ jobs:
     strategy:
       matrix:
         ghc:
-          - "9.0.1"
-          - "8.10.4"
+          - "9.2.1"
+          - "9.0.2"
+          - "8.10.7"
           - "8.8.4"
           - "8.6.5"
           - "8.4.4"
@@ -62,7 +63,7 @@ jobs:
           git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
 
       - name: Set flag --lib-only
-        if: contains(matrix.ghc, ["9.0.1", "8.0.2", "7.10.3", "7.8.4", "7.6.3"])
+        if: contains(matrix.ghc, ["8.0.2", "7.10.3", "7.8.4", "7.6.3"])
         run: echo "flags=--lib-only" >> $github_env
 
       - name: Set flag --solver-benchmark
@@ -95,11 +96,11 @@ jobs:
         run: sh validate.sh -j 2 -w ghc-${{ matrix.ghc }} -v ${{ env.flags }} -s lib-suite
 
       - name: Validate cli-tests
-        if: contains(matrix.ghc, ["8.10.4", "8.8.4", "8.6.5", "8.4.4", "8.2.2"])
+        if: contains(matrix.ghc, ["8.10.7", "8.8.4", "8.6.5", "8.4.4", "8.2.2"])
         run: sh validate.sh -j 2 -w ghc-${{ matrix.ghc }} -v ${{ env.flags }} -s cli-tests
 
       - name: Validate cli-suite
-        if: contains(matrix.ghc, ["8.10.4", "8.8.4", "8.6.5", "8.4.4", "8.2.2"])
+        if: contains(matrix.ghc, ["8.10.7", "8.8.4", "8.6.5", "8.4.4", "8.2.2"])
         run: sh validate.sh -j 2 -w ghc-${{ matrix.ghc }} -v ${{ env.flags }} -s cli-suite
 
   validate_old:

diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal
@@ -103,7 +103,7 @@ library
 
   build-depends:
     , array         >=0.4      && <0.6
-    , base          >=4.10     && <4.15
+    , base          >=4.10     && <4.17
     , binary        >=0.7.3    && <0.9
     , bytestring    >=0.10.6.0 && <0.12
     , Cabal         ^>=3.7
@@ -137,7 +137,7 @@ Test-Suite unit-tests
      UnitTests.Distribution.Solver.Modular.MessageUtils
 
    build-depends:
-     , base        >= 4.10  && <4.15
+     , base        >= 4.10  && <4.17
      , Cabal
      , Cabal-syntax
      , cabal-install-solver

diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
@@ -46,7 +46,7 @@ common warnings
       ghc-options: -Wunused-packages
 
 common base-dep
-    build-depends: base >=4.10 && <4.16
+    build-depends: base >=4.10 && <4.17
 
 common cabal-dep
     build-depends: Cabal ^>=3.7
@@ -319,7 +319,7 @@ Test-Suite unit-tests
           directory,
           filepath,
           mtl,
-          network-uri >= 2.6.2.0 && <2.6.4.0,
+          network-uri >= 2.6.2.0 && <2.7,
           random,
           tar,
           time,
@@ -406,7 +406,7 @@ test-suite long-tests
         filepath,
         hashable,
         mtl,
-        network-uri >= 2.6.2.0 && <2.6.4.0,
+        network-uri >= 2.6.2.0 && <2.7,
         random,
         tagged,
         tasty >= 1.2.3 && <1.5,

diff --git a/cabal-install/tests/IntegrationTests2.hs b/cabal-install/tests/IntegrationTests2.hs
@@ -509,7 +509,7 @@ mkTargetAllPackages = TargetAllPackages Nothing
 
 instance IsString PackageIdentifier where
     fromString pkgidstr = pkgid
-      where pkgid = fromMaybe (error $"fromString @PackageIdentifier " ++ show pkgidstr) $ simpleParse pkgidstr
+      where pkgid = fromMaybe (error $ "fromString @PackageIdentifier " ++ show pkgidstr) $ simpleParse pkgidstr
 
 
 testTargetSelectorNoCurrentPackage :: Assertion
@@ -1611,8 +1611,8 @@ type PlanDetails = (ProjDetails,
 planProject :: FilePath -> ProjectConfig -> IO PlanDetails
 planProject testdir cliConfig = do
 
-    projDetails@
-      (distDirLayout,
+    projDetails@(
+       distDirLayout,
        cabalDirLayout,
        projectConfig,
        localPackages,

diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal
@@ -26,7 +26,7 @@ common shared
   default-language: Haskell2010
 
   build-depends:
-    , base >= 4.6 && <4.16
+    , base >= 4.6 && <4.17
     -- this needs to match the in-tree lib:Cabal version
     , Cabal == 3.7.0.0
     , Cabal-syntax == 3.7.0.0
@@ -57,7 +57,7 @@ library
     Test.Cabal.ScriptEnv0
 
   build-depends:
-    , aeson                 ^>= 1.4.2.0 || ^>=1.5.0.0
+    , aeson                 ^>= 1.4.2.0 || ^>=1.5.0.0 || ^>= 2.0.0.0
     , async                 ^>= 2.2.1
     , attoparsec            ^>= 0.13.2.2 || ^>=0.14.1
     , base16-bytestring     ^>= 0.1.1.6 || ^>= 1.0.0.0