From 4c33285f5e4daf63523c67079bd804de67bebe3c Mon Sep 17 00:00:00 2001 From: Michael Webb Date: Wed, 18 Dec 2024 11:45:49 +1100 Subject: [PATCH 1/5] Try setting simpler version bounds instead --- tasty-golden-extra.cabal | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tasty-golden-extra.cabal b/tasty-golden-extra.cabal index 46f2dc2..5eb191c 100644 --- a/tasty-golden-extra.cabal +++ b/tasty-golden-extra.cabal @@ -31,17 +31,17 @@ source-repository head common deps build-depends: - , aeson ==2.1.2.1 || ==2.2.3.0 + , aeson >=2.1.2.1 && <2.2.3.0.0 , aeson-diff ^>=1.1.0.13 , aeson-pretty ^>=0.8.10 - , base ==4.14.3.0 || ==4.15.1.0 || ==4.16.3.0 || ==4.17.1.0 || ==4.18.2.1 || ==4.19.1.0 - , bytestring ==0.10.12.0 || ==0.10.12.1 || ==0.11.3.1 || ==0.11.4.0 || ==0.11.5.3 || ==0.12.1.0 + , base >=4.14.3.0 && <4.19.1.0.0 + , bytestring >=0.10.12.0 && <0.12.1.0.0 , pretty-show ^>=1.10 , pretty-simple ^>=4.1.3.0 , tasty ^>=1.5.2 , tasty-discover ^>=5.0.0 , tasty-golden ^>=2.3.5 - , text ==1.2.4.1 || ==1.2.5.0 || ==2.0.2 || ==2.1.1 + , text >=1.2.4.1 && <2.1.1.0 , yaml ^>=0.11.11.2 common opts From c85fa7c4f9662c3455c650d8dd8193d5681607c9 Mon Sep 17 00:00:00 2001 From: Michael Webb Date: Wed, 18 Dec 2024 12:01:50 +1100 Subject: [PATCH 2/5] Make version bounds make sense --- tasty-golden-extra.cabal | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasty-golden-extra.cabal b/tasty-golden-extra.cabal index 5eb191c..ab10a15 100644 --- a/tasty-golden-extra.cabal +++ b/tasty-golden-extra.cabal @@ -31,17 +31,17 @@ source-repository head common deps build-depends: - , aeson >=2.1.2.1 && <2.2.3.0.0 + , aeson >=2.1.2.1 && <2.2.4 , aeson-diff ^>=1.1.0.13 , aeson-pretty ^>=0.8.10 - , base >=4.14.3.0 && <4.19.1.0.0 - , bytestring >=0.10.12.0 && <0.12.1.0.0 + , base >=4.14.3 && <4.19.2 + , bytestring >=0.10.12 && <0.12.2 , pretty-show ^>=1.10 - , pretty-simple ^>=4.1.3.0 + , pretty-simple ^>=4.1.3 , tasty ^>=1.5.2 - , tasty-discover ^>=5.0.0 + , tasty-discover ^>=5 , tasty-golden ^>=2.3.5 - , text >=1.2.4.1 && <2.1.1.0 + , text >=1.2.4.1 && <2.1.2 , yaml ^>=0.11.11.2 common opts From 82d6992b19dcb37f0eb7914e079c1cd2b36066b4 Mon Sep 17 00:00:00 2001 From: Michael Webb Date: Wed, 18 Dec 2024 12:07:38 +1100 Subject: [PATCH 3/5] Allow up to the next minor version --- tasty-golden-extra.cabal | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tasty-golden-extra.cabal b/tasty-golden-extra.cabal index ab10a15..e6b3c6a 100644 --- a/tasty-golden-extra.cabal +++ b/tasty-golden-extra.cabal @@ -31,17 +31,17 @@ source-repository head common deps build-depends: - , aeson >=2.1.2.1 && <2.2.4 + , aeson >=2.1.2.1 && <2.3 , aeson-diff ^>=1.1.0.13 , aeson-pretty ^>=0.8.10 - , base >=4.14.3 && <4.19.2 - , bytestring >=0.10.12 && <0.12.2 + , base >=4.14.3 && <4.20 + , bytestring >=0.10.12 && <0.13 , pretty-show ^>=1.10 , pretty-simple ^>=4.1.3 , tasty ^>=1.5.2 , tasty-discover ^>=5 , tasty-golden ^>=2.3.5 - , text >=1.2.4.1 && <2.1.2 + , text >=1.2.4.1 && <2.2 , yaml ^>=0.11.11.2 common opts From 0f3504d6c5babcfd788b6238ffeba671108ced1b Mon Sep 17 00:00:00 2001 From: Michael Webb Date: Wed, 18 Dec 2024 12:09:32 +1100 Subject: [PATCH 4/5] Let us try the bounds of Jack --- tasty-golden-extra.cabal | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasty-golden-extra.cabal b/tasty-golden-extra.cabal index e6b3c6a..72f7cb1 100644 --- a/tasty-golden-extra.cabal +++ b/tasty-golden-extra.cabal @@ -31,17 +31,17 @@ source-repository head common deps build-depends: - , aeson >=2.1.2.1 && <2.3 + , aeson >=2.1 && <2.3 , aeson-diff ^>=1.1.0.13 , aeson-pretty ^>=0.8.10 - , base >=4.14.3 && <4.20 - , bytestring >=0.10.12 && <0.13 + , base >=4.14 && <4.20 + , bytestring >=0.10 && <0.13 , pretty-show ^>=1.10 - , pretty-simple ^>=4.1.3 + , pretty-simple ^>=4.1.3.0 , tasty ^>=1.5.2 - , tasty-discover ^>=5 + , tasty-discover ^>=5.0.0 , tasty-golden ^>=2.3.5 - , text >=1.2.4.1 && <2.2 + , text ^>=1.2 || ^>=2.1 , yaml ^>=0.11.11.2 common opts From 47b8f311b9f07580f82e81ebf61aa9ededc368d7 Mon Sep 17 00:00:00 2001 From: Michael Webb Date: Wed, 18 Dec 2024 12:14:58 +1100 Subject: [PATCH 5/5] Waves fist at `text` --- tasty-golden-extra.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasty-golden-extra.cabal b/tasty-golden-extra.cabal index 72f7cb1..949b616 100644 --- a/tasty-golden-extra.cabal +++ b/tasty-golden-extra.cabal @@ -41,7 +41,7 @@ common deps , tasty ^>=1.5.2 , tasty-discover ^>=5.0.0 , tasty-golden ^>=2.3.5 - , text ^>=1.2 || ^>=2.1 + , text ^>=1.2 || ^>=2.0 || ^>=2.1 , yaml ^>=0.11.11.2 common opts