diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d15bf4..0203937 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [HEAD] +## [0.5.0.7] - 2017-11-08 +### Changed +- Fixed dependencies' bounds. + ## [0.5.0.6] - 2017-10-23 ### Changed - Fixed dependencies' bounds. @@ -125,8 +129,8 @@ - Initial version of the package. -[HEAD]: ../../compare/v0.6.0...HEAD -[0.6.0]: ../../compare/v0.5.0.6...v0.6.0 +[HEAD]: ../../compare/v0.5.0.7...HEAD +[0.5.0.7]: ../../compare/v0.5.0.6...v0.5.0.7 [0.5.0.6]: ../../compare/v0.5.0.5...v0.5.0.6 [0.5.0.5]: ../../compare/v0.5.0.4...v0.5.0.5 [0.5.0.4]: ../../compare/v0.5.0.3...v0.5.0.4 diff --git a/default.nix b/default.nix index 03511a2..7acc0da 100644 --- a/default.nix +++ b/default.nix @@ -1,21 +1,37 @@ -{ mkDerivation, base, base64-bytestring, blaze-builder, bytestring -, cereal, cookie, cryptonite, data-default, deepseq, exceptions -, hspec, http-api-data, http-types, memory, mtl, QuickCheck -, servant, servant-server, stdenv, tagged, time, transformers, wai -, hspec-wai, servant-blaze, criterion +{ mkDerivation, base, base-compat, base64-bytestring, blaze-builder +, blaze-html, blaze-markup, bytestring, cereal, cookie, criterion +, cryptonite, data-default, deepseq, directory, exceptions +, filepath, hspec, hspec-wai, http-api-data, http-media, http-types +, memory, mtl, QuickCheck, servant, servant-blaze, servant-server +, stdenv, tagged, text, time, transformers, wai, wai-extra, warp }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.5.0.6"; + version = "0.5.0.7"; src = ./.; + configureFlags = [ "-fbuild-examples" "-fservant91" ]; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring cereal cookie cryptonite data-default exceptions http-api-data http-types memory - mtl servant servant-server tagged time transformers wai criterion + mtl servant servant-server tagged time transformers wai + ]; + executableHaskellDepends = [ + base base-compat base64-bytestring blaze-html blaze-markup + bytestring cereal cryptonite data-default directory exceptions + filepath http-api-data http-media http-types mtl servant + servant-blaze servant-server text time transformers wai warp ]; testHaskellDepends = [ - base bytestring cereal cryptonite data-default deepseq hspec - QuickCheck servant-server time hspec-wai servant-blaze + base base-compat base64-bytestring blaze-html blaze-markup + bytestring cereal cryptonite data-default deepseq directory + exceptions filepath hspec hspec-wai http-api-data http-media + http-types mtl QuickCheck servant servant-blaze servant-server text + time transformers wai wai-extra + ]; + benchmarkHaskellDepends = [ + base bytestring criterion cryptonite servant-server ]; description = "Authentication via encrypted cookies"; license = stdenv.lib.licenses.bsd3; diff --git a/servant-auth-cookie.cabal b/servant-auth-cookie.cabal index af86327..7c20f0c 100644 --- a/servant-auth-cookie.cabal +++ b/servant-auth-cookie.cabal @@ -1,5 +1,5 @@ name: servant-auth-cookie -version: 0.5.0.6 +version: 0.5.0.7 synopsis: Authentication via encrypted cookies description: Authentication via encrypted client-side cookies, inspired by client-session library by Michael Snoyman and based on @@ -54,11 +54,11 @@ library , cryptonite >= 0.14 && < 0.25 , data-default , exceptions >= 0.8 && < 0.9 - , http-types >= 0.10 && < 0.11 + , http-types >= 0.9 && < 0.11 , memory >= 0.11 && < 0.15 - , mtl >= 2.0 && < 3.0 - , servant >= 0.5 && < 0.12 - , servant-server >= 0.5 && < 0.12 + , mtl >= 2.0 && < 3.0 + , servant >= 0.5 && < 0.13 + , servant-server >= 0.5 && < 0.13 , tagged == 0.8.* , time >= 1.5 && < 1.8.1 , transformers >= 0.4 && < 0.6 @@ -103,8 +103,8 @@ test-suite tests , deepseq >= 1.3 && < 1.5 , hspec >= 2.0 && < 3.0 , servant-auth-cookie - , servant-server >= 0.5 && < 0.12 - , transformers >= 0.4 && < 0.6 + , servant-server >= 0.5 && < 0.13 + , transformers >= 0.4 && < 0.6 , time >= 1.5 && < 1.8.1 if !impl(ghc >= 7.8) build-depends: tagged == 0.8.* @@ -129,12 +129,12 @@ executable example , exceptions , filepath , http-media - , http-types >= 0.10 && < 0.11 + , http-types >= 0.9 && < 0.11 , mtl >= 2.0 && < 3.0 - , servant >= 0.5 && < 0.12 + , servant >= 0.5 && < 0.13 , servant-auth-cookie - , servant-blaze >= 0.5 && < 0.10 - , servant-server >= 0.5 && < 0.12 + , servant-blaze >= 0.5 && < 0.8 + , servant-server >= 0.5 && < 0.13 , text , time , transformers >= 0.4 && < 0.6 @@ -182,14 +182,14 @@ test-suite example-tests , directory , filepath , http-media - , http-types >= 0.10 && < 0.11 + , http-types >= 0.9 && < 0.11 , hspec >= 2.0 && < 3.0 , hspec-wai , mtl >= 2.0 && < 3.0 , QuickCheck >= 2.4 && < 3.0 , servant-auth-cookie - , servant-blaze >= 0.5 && < 0.10 - , servant-server >= 0.5 && < 0.12 + , servant-blaze >= 0.5 && < 0.8 + , servant-server >= 0.5 && < 0.13 , text , time >= 1.5 && < 1.8.1 , transformers >= 0.4 && < 0.6 @@ -230,7 +230,7 @@ benchmark bench , criterion >= 0.6.2.1 && < 1.3 , cryptonite >= 0.14 && < 0.25 , servant-auth-cookie - , servant-server >= 0.5 && < 0.12 + , servant-server >= 0.5 && < 0.13 if flag(dev) ghc-options: -Wall -Werror else diff --git a/shell.nix b/shell.nix index 5edde5b..1a02de9 100644 --- a/shell.nix +++ b/shell.nix @@ -10,11 +10,6 @@ let haskellPackages_ = haskellPackages.override { overrides = self: super: { - criterion = dontCheck (self.callPackage ../_deps/criterion-1.2.nix {}); - cryptonite = dontCheck (self.callPackage ../_deps/cryptonite-0.24.nix {}); - microstache = dontCheck (self.callPackage ../_deps/microstache-1.nix {}); - statistics = dontCheck (self.callPackage ../_deps/statistics-0.14.0.2.nix {}); - base-orphans = dontCheck (self.callPackage ../_deps/base-orphans-0.6.nix {}); }; }; diff --git a/src/Servant/Server/Experimental/Auth/Cookie.hs b/src/Servant/Server/Experimental/Auth/Cookie.hs index 0a60e8f..a6623ac 100644 --- a/src/Servant/Server/Experimental/Auth/Cookie.hs +++ b/src/Servant/Server/Experimental/Auth/Cookie.hs @@ -132,11 +132,11 @@ import Servant.API.ResponseHeaders (Headers) import qualified Servant.API.Header as S(Header) #endif -#if MIN_VERSION_http_types(0,9,2) -import Network.HTTP.Types (hSetCookie) +#if MIN_VERSION_http_types(0,10,0) +import Network.HTTP.Types.Header (hSetCookie) #endif -#if MIN_VERSION_http_types(0,9,2) +#if MIN_VERSION_http_types(0,10,0) #else hSetCookie :: HeaderName hSetCookie = "Set-Cookie"