Skip to content

Commit 97dc302

Browse files
committed
Fix #1128, fix #1130 by adding bounds to Cabal-syntax and haddock-library
1 parent c84f467 commit 97dc302

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

hackage-server.cabal

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ common defaults
118118
build-depends:
119119
, aeson ^>= 2.0.3.0
120120
, Cabal ^>= 3.6.3.0
121+
, Cabal-syntax ^>= 3.6.0.0
122+
-- Cabal-syntax needs to be bound to constrain hackage-security
123+
-- see https://github.com/haskell/hackage-server/issues/1130
121124
, fail ^>= 4.9.0
122125
-- we use Control.Monad.Except, introduced in mtl-2.2.1
123126
, network >= 3 && < 3.2
@@ -390,9 +393,14 @@ library lib-server
390393
, cryptohash-sha256 ^>= 0.11.100
391394
, csv ^>= 0.1
392395
, ed25519 ^>= 0.0.5
393-
, hackage-security ^>= 0.6
396+
, hackage-security >= 0.6 && < 0.7
397+
-- N.B: hackage-security-0.6.2 uses Cabal-syntax-3.8.1.0
398+
-- see https://github.com/haskell/hackage-server/issues/1130
399+
-- Thus, we need to include Cabal-syntax as dependency explicitly
394400
, hackage-security-HTTP ^>= 0.1.1
395-
, haddock-library > 1.7 && < 2
401+
, haddock-library >= 1.7.0 && < 1.11
402+
-- haddock-library-1.11.0 changed type of markupOrderedList
403+
-- see https://github.com/haskell/hackage-server/issues/1128
396404
, happstack-server ^>= 7.7.1
397405
, hashable ^>= 1.3 || ^>= 1.4
398406
, hslogger ^>= 1.3.1

0 commit comments

Comments
 (0)