eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix tests for some servant-auth pkgs on GHC 9

Browse source 
Turns out the tests broke because of base64-bytestring issue specific to
GHC-9 that was fixed in 1.2.1.0.

Fixes #1474
This commit is contained in:
Maxim Koltsov 2021-10-30 20:43:35 +02:00
parent bd9e4b1090
commit 551d4936af
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
servant-auth/servant-auth-server/servant-auth-server.cabal
View file

@ -33,7 +33,7 @@ library
build-depends: build-depends:
base >= 4.10 && < 4.16 base >= 4.10 && < 4.16
, aeson >= 1.3.1.1 && < 1.6 , aeson >= 1.3.1.1 && < 1.6
, base64-bytestring >= 1.0.0.1 && < 1.2 , base64-bytestring >= 1.0.0.1 && < 1.3
, blaze-builder >= 0.4.1.0 && < 0.5 , blaze-builder >= 0.4.1.0 && < 0.5
, bytestring >= 0.10.6.0 && < 0.11 , bytestring >= 0.10.6.0 && < 0.11
, case-insensitive >= 1.2.0.11 && < 1.3 , case-insensitive >= 1.2.0.11 && < 1.3
@ -55,6 +55,13 @@ library
, unordered-containers >= 0.2.9.0 && < 0.3 , unordered-containers >= 0.2.9.0 && < 0.3
, wai >= 3.2.1.2 && < 3.3 , wai >= 3.2.1.2 && < 3.3
if impl(ghc >= 9)
build-depends:
-- base64-bytestring 1.2.1.0 contains important fix for GHC-9, lower versions
-- produce wrong results, thus corrupring JWT via jose package.
-- See: https://github.com/haskell/base64-bytestring/pull/46
base64-bytestring >= 1.2.1.0
exposed-modules: exposed-modules:
Servant.Auth.Server Servant.Auth.Server
Servant.Auth.Server.Internal Servant.Auth.Server.Internal
@ -87,8 +94,6 @@ test-suite readme
default-language: Haskell2010 default-language: Haskell2010
if impl(ghcjs) if impl(ghcjs)
buildable: False buildable: False
if impl(ghc >= 9)
buildable: False
test-suite spec test-suite spec
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
@ -114,8 +119,6 @@ test-suite spec
, servant , servant
, servant-server , servant-server
, transformers , transformers
if impl(ghc >= 9)
buildable: False
-- test dependencies -- test dependencies
build-depends: build-depends: