git.iko.soy/servant
on master help sign in
Merge pull request #1476 from haskell-servant/maksbotan/fix-servant-auth-tests

Fix tests for some servant-auth pkgs on GHC 9

commit043d5a0e90b76142e71f2bae3e17e1a46e46b518 authorMaxim Koltsov <kolmax94@gmail.com> dateSun 31 Oct 2021, 22:04 (5 years ago) parent70f6c49ca6774d
4 files changed+10−9
compare with master
unifiedsplit
cabal.project+1−1 doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+1−1 servant-auth/servant-auth-client/servant-auth-client.cabal−2 servant-auth/servant-auth-server/servant-auth-server.cabal+8−5
cabal.project+1−1
@@ -36,7 +36,7 @@ packages:
3636 doc/cookbook/generic
3737 doc/cookbook/hoist-server-with-context
3838 doc/cookbook/https
39− -- doc/cookbook/jwt-and-basic-auth/
39+ doc/cookbook/jwt-and-basic-auth
4040 doc/cookbook/pagination
4141 -- doc/cookbook/sentry
4242 -- Commented out because servant-quickcheck currently doesn't build.
doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+1−1
@@ -22,7 +22,7 @@ executable cookbook-jwt-and-basic-auth
2222 , servant
2323 , servant-client
2424 , servant-server
25− , servant-auth ==0.3.*
25+ , servant-auth == 0.4.*
2626 , servant-auth-server >= 0.3.1.0
2727 , warp >= 3.2
2828 , wai >= 3.2
servant-auth/servant-auth-client/servant-auth-client.cabal−2
@@ -59,8 +59,6 @@ test-suite spec
5959 , servant-auth
6060 , servant
6161 , servant-auth-client
62− if impl(ghc >= 9)
63− buildable: False
6462
6563 -- test dependencies
6664 build-depends:
servant-auth/servant-auth-server/servant-auth-server.cabal+8−5
@@ -33,7 +33,7 @@ library
3333 build-depends:
3434 base >= 4.10 && < 4.16
3535 , aeson >= 1.3.1.1 && < 1.6
36− , base64-bytestring >= 1.0.0.1 && < 1.2
36+ , base64-bytestring >= 1.0.0.1 && < 1.3
3737 , blaze-builder >= 0.4.1.0 && < 0.5
3838 , bytestring >= 0.10.6.0 && < 0.11
3939 , case-insensitive >= 1.2.0.11 && < 1.3
@@ -55,6 +55,13 @@ library
5555 , unordered-containers >= 0.2.9.0 && < 0.3
5656 , wai >= 3.2.1.2 && < 3.3
5757
58+ if impl(ghc >= 9)
59+ build-depends:
60+ -- base64-bytestring 1.2.1.0 contains important fix for GHC-9, lower versions
61+ -- produce wrong results, thus corrupring JWT via jose package.
62+ -- See: https://github.com/haskell/base64-bytestring/pull/46
63+ base64-bytestring >= 1.2.1.0
64+
5865 exposed-modules:
5966 Servant.Auth.Server
6067 Servant.Auth.Server.Internal
@@ -87,8 +94,6 @@ test-suite readme
8794 default-language: Haskell2010
8895 if impl(ghcjs)
8996 buildable: False
90− if impl(ghc >= 9)
91− buildable: False
9297
9398test-suite spec
9499 type: exitcode-stdio-1.0
@@ -114,8 +119,6 @@ test-suite spec
114119 , servant
115120 , servant-server
116121 , transformers
117− if impl(ghc >= 9)
118− buildable: False
119122
120123 -- test dependencies
121124 build-depends: