Support text-2.1 in Cabal and Cabal-syntax (haskell#9242)

* Support text-2.1 in Cabal and Cabal-syntax * Add changelog entry * Use tasty-quickcheck 0.10.1.2 This avoid picking a tasty-quickcheck that can have tasty-1.5 * Revert "Use tasty-quickcheck 0.10.1.2" This reverts commit da03d8d.
BinderDavid · Sep 19, 2023 · 398541a · 398541a
1 parent 1536ccd
commit 398541a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Cabal-syntax/Cabal-syntax.cabal b/Cabal-syntax/Cabal-syntax.cabal
@@ -39,7 +39,7 @@ library
     mtl        >= 2.1      && < 2.4,
     parsec     >= 3.1.13.0 && < 3.2,
     pretty     >= 1.1.1    && < 1.2,
-    text       (>= 1.2.3.0 && < 1.3) || (>= 2.0 && < 2.1),
+    text       (>= 1.2.3.0 && < 1.3) || (>= 2.0 && < 2.2),
     time       >= 1.4.0.1  && < 1.13,
     -- transformers-0.4.0.0 doesn't have record syntax e.g. for Identity
     -- See also https://github.com/ekmett/transformers-compat/issues/35

diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -305,7 +305,7 @@ library
     -- See also https://github.com/ekmett/transformers-compat/issues/35
     transformers (>= 0.3      && < 0.4) || (>=0.4.1.0 && <0.7),
     mtl           >= 2.1      && < 2.4,
-    text         (>= 1.2.3.0  && < 1.3) || (>= 2.0 && < 2.1),
+    text         (>= 1.2.3.0  && < 1.3) || (>= 2.0 && < 2.2),
     parsec        >= 3.1.13.0 && < 3.2
 
   other-modules:

diff --git a/changelog.d/pr-9242 b/changelog.d/pr-9242
@@ -0,0 +1,3 @@
+synopsis: Support text-2.1 in Cabal and Cabal-syntax
+packages: Cabal Cabal-syntax
+prs: #9242