From e81c7648119d5ab080f12c213d4637a4e2d2b1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9cate=20Moonlight?=
<Kleidukos@users.noreply.github.com>
Date: Mon, 11 Sep 2023 00:05:12 +0200
Subject: [PATCH] Support text-2.1 in Cabal and Cabal-syntax (#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 da03d8d560d6acf6aa62b3b2e5d013974083b642.
(cherry picked from commit 6946384ebde3b342b26bd1d23a588c28f77fabde)
---
Cabal-syntax/Cabal-syntax.cabal | 2 +-
Cabal/Cabal.cabal | 2 +-
changelog.d/pr-9242 | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 changelog.d/pr-9242
diff --git a/Cabal-syntax/Cabal-syntax.cabal b/Cabal-syntax/Cabal-syntax.cabal
index f74b827e34..7ec9b1064a 100644
--- 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
index da42b926e0..7f57a2e3b8 100644
--- a/Cabal/Cabal.cabal
+++ b/Cabal/Cabal.cabal
@@ -302,7 +302,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
new file mode 100644
index 0000000000..dfabc5fd98
--- /dev/null
+++ 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
--
GitLab