From e5e5440d4a9dd94f89c946ab0afd1a924d6bb947 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Thu, 12 Feb 2026 09:29:15 -0500 Subject: [PATCH] Bump to ghc-9.10.3 for quickjobs - Trigger CI on push for test - Add test run for bumping to ghc-9.8.4 - Bump dev-scripts upper bounds for ghc-9.10.3 - Bump to ghc-9.10.3 for quickjobs - Fix -Wunused-imports for Control.Monad.IO.Class - Drop older versions of aeson - Bump aeson - Bump lens - Remove unnecessary vertical alignment whitespace - Bump optparse-applicative - Avoid -Wunused-imports for liftA2 - Revert push to only branch master --- .github/workflows/quick-jobs.yml | 2 +- cabal-dev-scripts/cabal-dev-scripts.cabal | 16 ++++++++-------- cabal-dev-scripts/src/AnalyseImports.hs | 2 +- cabal-dev-scripts/src/Capture.hs | 1 - 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/quick-jobs.yml b/.github/workflows/quick-jobs.yml index d388386f9d7..d1ace5eb058 100644 --- a/.github/workflows/quick-jobs.yml +++ b/.github/workflows/quick-jobs.yml @@ -15,7 +15,7 @@ on: - created env: - GHC_FOR_QUICK_JOBS: 9.6.5 + GHC_FOR_QUICK_JOBS: 9.10.3 jobs: meta: diff --git a/cabal-dev-scripts/cabal-dev-scripts.cabal b/cabal-dev-scripts/cabal-dev-scripts.cabal index 5ae899febe1..92002387ee7 100644 --- a/cabal-dev-scripts/cabal-dev-scripts.cabal +++ b/cabal-dev-scripts/cabal-dev-scripts.cabal @@ -17,13 +17,13 @@ executable gen-spdx hs-source-dirs: src ghc-options: -Wall build-depends: - , aeson ^>=1.4.1.0 || ^>=1.5.2.0 || ^>=2.2.1.0 - , base >=4.13 && <4.20 + , aeson ^>=2.2.3.0 + , base >=4.13 && <4.21 , bytestring , containers , Diff ^>=0.4 - , lens ^>=4.18.1 || ^>=4.19.1 || ^>=5.0.1 || ^>=5.2 - , optparse-applicative ^>=0.15.1.0 || ^>=0.16.0.0 + , lens ^>=5.3 + , optparse-applicative ^>=0.19.0.0 , text , zinza ^>=0.2 @@ -34,13 +34,13 @@ executable gen-spdx-exc hs-source-dirs: src ghc-options: -Wall build-depends: - , aeson ^>=1.4.1.0 || ^>=1.5.2.0 || ^>=2.2.1.0 - , base >=4.13 && <4.20 + , aeson ^>=2.2.3.0 + , base >=4.13 && <4.21 , bytestring , containers , Diff ^>=0.4 - , lens ^>=4.18.1 || ^>=4.19.1 || ^>=5.0.1 || ^>=5.2 - , optparse-applicative ^>=0.15.1.0 || ^>=0.16.0.0 + , lens ^>=5.3 + , optparse-applicative ^>=0.19.0.0 , text , zinza ^>=0.2 diff --git a/cabal-dev-scripts/src/AnalyseImports.hs b/cabal-dev-scripts/src/AnalyseImports.hs index 5c96155527b..04b43699907 100644 --- a/cabal-dev-scripts/src/AnalyseImports.hs +++ b/cabal-dev-scripts/src/AnalyseImports.hs @@ -1,7 +1,7 @@ {-# LANGUAGE LambdaCase #-} module Main (main) where -import Control.Applicative (liftA2, many, (<|>)) +import Control.Applicative import Control.Monad (void) import Data.Foldable (for_) import Data.List (sortBy) diff --git a/cabal-dev-scripts/src/Capture.hs b/cabal-dev-scripts/src/Capture.hs index 886fb035023..f2fc4cce83d 100644 --- a/cabal-dev-scripts/src/Capture.hs +++ b/cabal-dev-scripts/src/Capture.hs @@ -2,7 +2,6 @@ module Capture (capture) where import Language.Haskell.TH import Language.Haskell.TH.Syntax (NameFlavour (..), Name (..)) -import Control.Monad.IO.Class import Data.Generics as SYB