Merge pull request #8050 from jneira/update-stack

Update stack.yaml resolver and fix cabal-testsuite stack build

Author: mergify[bot]

cabal-testsuite/cabal-testsuite.cabal

@@ -113,4 +113,5 @@ executable setup
 custom-setup
   -- we only depend on even stable releases of lib:Cabal
   setup-depends: Cabal == 2.2.* || == 2.4.* || == 3.0.* || ==3.2.* || ==3.4.* || ==3.6.*,
+                 Cabal-syntax == 3.6.*,
                  base, filepath, directory

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-18.17
+resolver: lts-18.28 # ghc-8.10.7
 
 packages:
 - Cabal-syntax/
@@ -14,8 +14,12 @@ packages:
 - solver-benchmarks/
 
 extra-deps:
-- rere-0.2@sha256:ec1d87554c03755d89f3401c5e5c27827e61dde835c54cbdaf509136ce8f6f2b,4079
+# Not included in stackage
+- rere-0.2@rev:1
 
+# We require the released version of Cabal and Cabal-syntax for cabal-testsuite
+# but ususally we have a development, newer version set in the local package
+# Also needed for hackage-security and Win32
 allow-newer: true
 
 nix: