git.iko.soy/servant
on master help sign in
Merge pull request #1476 from haskell-servant/maksbotan/fix-servant-auth-tests
043d5a0Maxim Koltsov
cabal.project+1−1
compare with master
unifiedsplit
@@ -36,7 +36,7 @@ packages:
36 doc/cookbook/generic
36 doc/cookbook/generic
37 doc/cookbook/hoist-server-with-context
37 doc/cookbook/hoist-server-with-context
38 doc/cookbook/https
38 doc/cookbook/https
39− -- doc/cookbook/jwt-and-basic-auth/
39+ doc/cookbook/jwt-and-basic-auth
40 doc/cookbook/pagination
40 doc/cookbook/pagination
41 -- doc/cookbook/sentry
41 -- doc/cookbook/sentry
42 -- Commented out because servant-quickcheck currently doesn't build.
42 -- 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
22 , servant
22 , servant
23 , servant-client
23 , servant-client
24 , servant-server
24 , servant-server
25− , servant-auth ==0.3.*
25+ , servant-auth == 0.4.*
26 , servant-auth-server >= 0.3.1.0
26 , servant-auth-server >= 0.3.1.0
27 , warp >= 3.2
27 , warp >= 3.2
28 , wai >= 3.2
28 , wai >= 3.2
servant-auth/servant-auth-client/servant-auth-client.cabal−2
@@ -59,8 +59,6 @@ test-suite spec
59 , servant-auth
59 , servant-auth
60 , servant
60 , servant
61 , servant-auth-client
61 , servant-auth-client
62− if impl(ghc >= 9)
63− buildable: False
64
62
65 -- test dependencies
63 -- test dependencies
66 build-depends:
64 build-depends:
servant-auth/servant-auth-server/servant-auth-server.cabal+8−5
@@ -33,7 +33,7 @@ library
33 build-depends:
33 build-depends:
34 base >= 4.10 && < 4.16
34 base >= 4.10 && < 4.16
35 , aeson >= 1.3.1.1 && < 1.6
35 , 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
37 , blaze-builder >= 0.4.1.0 && < 0.5
37 , blaze-builder >= 0.4.1.0 && < 0.5
38 , bytestring >= 0.10.6.0 && < 0.11
38 , bytestring >= 0.10.6.0 && < 0.11
39 , case-insensitive >= 1.2.0.11 && < 1.3
39 , case-insensitive >= 1.2.0.11 && < 1.3
@@ -55,6 +55,13 @@ library
55 , unordered-containers >= 0.2.9.0 && < 0.3
55 , unordered-containers >= 0.2.9.0 && < 0.3
56 , wai >= 3.2.1.2 && < 3.3
56 , wai >= 3.2.1.2 && < 3.3
57
57
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+
58 exposed-modules:
65 exposed-modules:
59 Servant.Auth.Server
66 Servant.Auth.Server
60 Servant.Auth.Server.Internal
67 Servant.Auth.Server.Internal
@@ -87,8 +94,6 @@ test-suite readme
87 default-language: Haskell2010
94 default-language: Haskell2010
88 if impl(ghcjs)
95 if impl(ghcjs)
89 buildable: False
96 buildable: False
90− if impl(ghc >= 9)
91− buildable: False
92
97
93test-suite spec
98test-suite spec
94 type: exitcode-stdio-1.0
99 type: exitcode-stdio-1.0
@@ -114,8 +119,6 @@ test-suite spec
114 , servant
119 , servant
115 , servant-server
120 , servant-server
116 , transformers
121 , transformers
117− if impl(ghc >= 9)
118− buildable: False
119
122
120 -- test dependencies
123 -- test dependencies
121 build-depends:
124 build-depends: