Merge pull request #7983 from jneira/fix-7835-for-3.6

Fix 7835 for 3.6
haskell · Feb 16, 2022 · d505ac2 · d505ac2
2 parents f27667f + 538cc0e
commit d505ac2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
@@ -270,7 +270,7 @@ executable cabal
         base16-bytestring >= 0.1.1 && < 1.1.0.0,
         binary     >= 0.7.3    && < 0.9,
         bytestring >= 0.10.6.0 && < 0.12,
-        Cabal      == 3.6.*,
+        Cabal      >= 3.6.1.0  && < 3.7,
         containers >= 0.5.6.2  && < 0.7,
         cryptohash-sha256 >= 0.11 && < 0.12,
         deepseq    >= 1.4.1.1  && < 1.5,
@@ -308,7 +308,7 @@ executable cabal
 
     if os(windows)
       -- newer directory for symlinks
-      build-depends: Win32 >= 2 && < 3, directory >=1.3.1.0
+      build-depends: Win32 >= 2 && < 2.8, directory >=1.3.1.0
     else
       build-depends: unix >= 2.5 && < 2.9
 

diff --git a/release-notes/Cabal-3.6.1.0.md b/release-notes/Cabal-3.6.1.0.md
@@ -52,6 +52,7 @@ Cabal 3.6.1.0 Changelog
 
 - lazily decode cache files for checking invalidation [#7516](https://github.com/haskell/cabal/pull/7516) [#7466](https://github.com/haskell/cabal/issues/7466)
   - This yields a significant 15% speedup on rebuilding build plans for projects with lots of individual cabal packages.
+  - It exports the [Tag data type](https://github.com/haskell/cabal/blob/899dd34bc48bbaa43da9a4b2fc354c24fd814d05/Cabal/src/Distribution/Utils/Structured.hs#L67), needed by `cabal-install >= 3.6.0.0`.
 
 - defer build-tools-depends choices as well as setup choices [#7561](https://github.com/haskell/cabal/pull/7561) [#7472](https://github.com/haskell/cabal/issues/7472)
   - extends the existing solver pass that defers solving setup depends until top-level goals are solved to also defer build-tool-depends goals until top level goals are solved.