Merge pull request #281 from Mikolaj/master

Fix compilation of hackage-security test suite with Cabal-syntax on Hackage and bump version of hackage-repo-tool before release

Author: Mikolaj

hackage-repo-tool/ChangeLog.md

@@ -1,3 +1,7 @@
+0.1.1.3
+-------
+* Compat release for `Cabal-syntax-3.8.1.0`
+
 0.1.1.2
 -------
 * Compat release for `hackage-security-0.6`

hackage-repo-tool/hackage-repo-tool.cabal

@@ -1,6 +1,6 @@
 cabal-version:       1.12
 name:                hackage-repo-tool
-version:             0.1.1.2
+version:             0.1.1.3
 
 build-type:          Simple
 synopsis:            Manage secure file-based package repositories
@@ -90,7 +90,7 @@ executable hackage-repo-tool
     build-depends: network     >= 2.5 && < 2.6
 
   if flag(Cabal-syntax)
-    build-depends: Cabal-syntax >= 3.7 && < 3.9
+    build-depends: Cabal-syntax >= 3.7 && < 3.10
   else
     build-depends: Cabal        >= 1.14    && < 1.26
                              || >= 2.0     && < 2.6

hackage-security/ChangeLog.md

@@ -1,5 +1,11 @@
 See also http://pvp.haskell.org/faq
 
+0.6.2.2
+-------
+
+* Fix broken compilation of test-suite with Cabal-syntax-3.8.1.0 on Hackage
+* Huge README updates
+
 0.6.2.1
 -------
 

hackage-security/hackage-security.cabal

@@ -1,7 +1,6 @@
 cabal-version:       1.12
 name:                hackage-security
-version:             0.6.2.1
-x-revision:          1
+version:             0.6.2.2
 
 synopsis:            Hackage security library
 description:         The hackage security library provides both server and
@@ -154,7 +153,7 @@ library
   else
     build-depends:     base       >= 4.10
 
-  if flag(Cabal-syntax)
+  if flag(Cabal-syntax) && impl(ghc >= 8.2)
     build-depends: Cabal-syntax >= 3.7 && < 3.10
   else
     build-depends: Cabal        >= 1.14    && < 1.26
@@ -263,7 +262,6 @@ test-suite TestSuite
   -- inherited constraints from lib:hackage-security component
   build-depends:       hackage-security,
                        base,
-                       Cabal,
                        containers,
                        bytestring,
                        network-uri,
@@ -272,8 +270,14 @@ test-suite TestSuite
                        time,
                        zlib
 
-  if flag(Cabal-syntax)
-    build-depends: Cabal-syntax
+  if flag(Cabal-syntax) && impl(ghc >= 8.2)
+    build-depends: Cabal        >= 3.7 && < 3.10,
+                   Cabal-syntax >= 3.7 && < 3.10
+  else
+    build-depends: Cabal        >= 1.14    && < 1.26
+                             || >= 2.0     && < 2.6
+                             || >= 3.0     && < 3.7,
+                   Cabal-syntax <  3.7
 
   -- dependencies exclusive to test-suite
   build-depends:       tasty            >= 1.2 && < 1.5,