From d6fefc1ff42abe0d822f3b6124fdf8a882a5e0fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9cate=20Moonlight?= Date: Sun, 10 Sep 2023 01:18:26 +0200 Subject: [PATCH 1/4] Support text-2.1 in Cabal and Cabal-syntax --- Cabal-syntax/Cabal-syntax.cabal | 2 +- Cabal/Cabal.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cabal-syntax/Cabal-syntax.cabal b/Cabal-syntax/Cabal-syntax.cabal index a915c48db94..1ce638579d7 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 48615f1a81a..87cd7138812 100644 --- 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: From fd3acba29f79e0d01b0a2015fd712919a278fcaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9cate=20Moonlight?= Date: Sun, 10 Sep 2023 01:20:32 +0200 Subject: [PATCH 2/4] Add changelog entry --- changelog.d/pr-9242 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog.d/pr-9242 diff --git a/changelog.d/pr-9242 b/changelog.d/pr-9242 new file mode 100644 index 00000000000..dfabc5fd982 --- /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 From da03d8d560d6acf6aa62b3b2e5d013974083b642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9cate=20Moonlight?= Date: Sun, 10 Sep 2023 10:12:31 +0200 Subject: [PATCH 3/4] Use tasty-quickcheck 0.10.1.2 This avoid picking a tasty-quickcheck that can have tasty-1.5 --- cabal-install-solver/cabal-install-solver.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal index 7849e53b5b6..31a1b65ac2d 100644 --- a/cabal-install-solver/cabal-install-solver.cabal +++ b/cabal-install-solver/cabal-install-solver.cabal @@ -143,5 +143,5 @@ Test-Suite unit-tests , Cabal-syntax , cabal-install-solver , tasty >= 1.2.3 && <1.5 - , tasty-quickcheck + , tasty-quickcheck == 0.10.1.2 , tasty-hunit >= 0.10 From 64089f9bd9fd827a8439096af936005b669f67a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9cate=20Moonlight?= Date: Sun, 10 Sep 2023 13:01:30 +0200 Subject: [PATCH 4/4] Revert "Use tasty-quickcheck 0.10.1.2" This reverts commit da03d8d560d6acf6aa62b3b2e5d013974083b642. --- cabal-install-solver/cabal-install-solver.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal index 31a1b65ac2d..7849e53b5b6 100644 --- a/cabal-install-solver/cabal-install-solver.cabal +++ b/cabal-install-solver/cabal-install-solver.cabal @@ -143,5 +143,5 @@ Test-Suite unit-tests , Cabal-syntax , cabal-install-solver , tasty >= 1.2.3 && <1.5 - , tasty-quickcheck == 0.10.1.2 + , tasty-quickcheck , tasty-hunit >= 0.10