From c1ac42ee58c1a6dab84c8f1fd24f2de715c51dcc Mon Sep 17 00:00:00 2001
From: Peter Lebbing <peter@digitalbrains.com>
Date: Thu, 6 Mar 2025 16:00:19 +0100
Subject: [PATCH] Support GHC 9.12

and bump bounds on `containers` as well.

Bump all Stack and GHC versions to their latest minors.
---
 .ci/cabal.project.local-upper |  2 +-
 .ci/stack-9.10.yaml           |  3 +++
 .ci/stack-9.6.yaml            |  2 +-
 .ci/stack-9.8.yaml            |  2 +-
 .github/workflows/ci.yaml     | 11 ++++++-----
 docopt.cabal                  | 13 +++++++------
 6 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 .ci/stack-9.10.yaml

diff --git a/.ci/cabal.project.local-upper b/.ci/cabal.project.local-upper
index 1f6bd88..1cd55e9 100644
--- a/.ci/cabal.project.local-upper
+++ b/.ci/cabal.project.local-upper
@@ -40,4 +40,4 @@ allow-newer:
   containers,
 
 constraints:
-  containers == 0.7,
+  containers == 0.8,
diff --git a/.ci/stack-9.10.yaml b/.ci/stack-9.10.yaml
new file mode 100644
index 0000000..e24e0a1
--- /dev/null
+++ b/.ci/stack-9.10.yaml
@@ -0,0 +1,3 @@
+resolver: nightly-2025-03-06
+ghc-options:
+  "$locals": -Werror -Wall -Wcompat -Wno-name-shadowing
diff --git a/.ci/stack-9.6.yaml b/.ci/stack-9.6.yaml
index 7a6b21d..ed66842 100644
--- a/.ci/stack-9.6.yaml
+++ b/.ci/stack-9.6.yaml
@@ -1,3 +1,3 @@
-resolver: lts-22.23
+resolver: lts-22.43
 ghc-options:
   "$locals": -Werror -Wall -Wcompat -Wno-name-shadowing
diff --git a/.ci/stack-9.8.yaml b/.ci/stack-9.8.yaml
index c01b764..3560184 100644
--- a/.ci/stack-9.8.yaml
+++ b/.ci/stack-9.8.yaml
@@ -1,3 +1,3 @@
-resolver: nightly-2024-05-31
+resolver: lts-23.11
 ghc-options:
   "$locals": -Werror -Wall -Wcompat -Wno-name-shadowing
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b1cb37e..08dbc70 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         # TODO: "8.0", "8.2", "8.4", "8.6"
-        ghc: ["8.8", "8.10", "9.0", "9.2", "9.4", "9.6", "9.8"]
+        ghc: ["8.8", "8.10", "9.0", "9.2", "9.4", "9.6", "9.8", "9.10"]
       fail-fast: false
     steps:
       - name: Checkout
@@ -86,15 +86,16 @@ jobs:
           - "9.0.2"
           - "9.2.8"
           - "9.4.8"
-          - "9.6.5"
-          - "9.8.2"
+          - "9.6.6"
+          - "9.8.4"
           - "9.10.1"
+          - "9.12.1"
         project-variant: [""]
         include:
           - ghc: 8.0.2
             project-variant: -lower
-          # - ghc: 9.10.1
-          #   project-variant: -upper
+          - ghc: 9.12.1
+            project-variant: -upper
 
       fail-fast: false
     steps:
diff --git a/docopt.cabal b/docopt.cabal
index f8d2a62..3485af5 100644
--- a/docopt.cabal
+++ b/docopt.cabal
@@ -18,9 +18,10 @@ tested-with:
   GHC == 9.0.2,
   GHC == 9.2.8,
   GHC == 9.4.8,
-  GHC == 9.6.5,
-  GHC == 9.8.2,
-  GHC == 9.10.1
+  GHC == 9.6.6,
+  GHC == 9.8.4,
+  GHC == 9.10.1,
+  GHC == 9.12.1
 
 category:            Console
 
@@ -43,7 +44,7 @@ source-repository head
 source-repository this
   type:       git
   location:   https://github.com/docopt/docopt.hs.git
-  tag:        v0.7.0.8+r1
+  tag:        v0.7.0.8+r2
 
 library
   exposed-modules:    System.Console.Docopt.NoTH
@@ -60,8 +61,8 @@ library
 
   build-depends:      base >= 4.9 && < 5.0,
                       parsec >= 3.1.14 && < 3.2,
-                      containers >= 0.6.2 && < 0.8,
-                      template-haskell >= 2.11.0 && < 2.23
+                      containers >= 0.6.2 && < 0.9,
+                      template-haskell >= 2.11.0 && < 2.24
 
   ghc-options:        -Wall -Wno-name-shadowing