Skip to content

Commit ae36927

Browse files
authored
Merge pull request haskell-servant#1769 from haskell-servant/hashable-1.5
Allow hashable-1.5, with allow-newers
2 parents dd0a38c + 1f58e79 commit ae36927

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed

cabal.project

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ if(impl(ghc >= 9.6.1))
7070
package servant-server
7171
ghc-options: -fprint-redundant-promotion-ticks
7272

73+
-- This block is for GHC 9.10.1.
7374
allow-newer: postgresql-simple:base
7475
allow-newer: postgresql-simple:template-haskell
7576
allow-newer: postgresql-simple:containers
@@ -86,3 +87,23 @@ allow-newer: servant-js:base
8687
allow-newer: servant-js:lens
8788
allow-newer: lucid:base
8889
allow-newer: Cabal
90+
91+
-- This block is for hashable-1.5
92+
allow-newer: vault:hashable
93+
allow-newer: unordered-containers:hashable
94+
allow-newer: async:hashable
95+
allow-newer: psqueues:hashable
96+
allow-newer: aeson:hashable
97+
allow-newer: witherable:hashable
98+
allow-newer: these:hashable
99+
allow-newer: strict:hashable
100+
allow-newer: semialign:hashable
101+
allow-newer: lens:hashable
102+
allow-newer: insert-ordered-containers:hashable
103+
allow-newer: optics-extra:hashable
104+
allow-newer: openapi3:hashable
105+
allow-newer: http-api-data:hashable
106+
allow-newer: swagger2:hashable
107+
allow-newer: quickcheck-instances:hashable
108+
allow-newer: postgresql-libpq:hashable
109+
allow-newer: postgresql-simple:hashable

servant-docs/servant-docs.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ library
5656
, aeson-pretty >= 0.8.5 && < 0.9
5757
, base-compat >= 0.10.5 && < 0.15
5858
, case-insensitive >= 1.2.0.11 && < 1.3
59-
, hashable >= 1.2.7.0 && < 1.5
59+
, hashable >= 1.2.7.0 && < 1.6
6060
, http-media >= 0.7.1.3 && < 0.9
6161
, http-types >= 0.12.2 && < 0.13
6262
, lens >= 4.17 && < 5.4
@@ -102,7 +102,7 @@ test-suite spec
102102

103103
-- Additional dependencies
104104
build-depends:
105-
tasty >= 1.1.0.4 && < 1.5,
105+
tasty >= 1.1.0.4 && < 1.6,
106106
tasty-golden >= 2.3.2 && < 2.4,
107107
tasty-hunit >= 0.10.0.1 && < 0.11,
108108
transformers >= 0.5.2.0 && < 0.7

0 commit comments

Comments
 (0)