cachix-api 0.5.0 → 0.6.0

raw patch · 6 files changed

+16/−10 lines, 6 filesdep −servant-auth-server

Dependencies removed: servant-auth-server

Files

CHANGELOG.md +4/−0
cachix-api.cabal +5/−6
src/Cachix/API/Signing.hs +2/−1
src/Cachix/Types/NarInfo.hs +3/−1
src/Cachix/Types/NixCacheInfo.hs +1/−1
src/Cachix/Types/Session.hs +1/−1

CHANGELOG.md view

@@ -7,6 +7,10 @@  ## [Unreleased] +## [0.6.0] - 2021-01-08++- Support latest stackage nightly+ ## [0.5.0] - 2020-11-06  - Rewrite, cachix-api now serves as the base for cachix package but doesn't contain the full HTTP API anymore.

cachix-api.cabal view

@@ -1,6 +1,6 @@ cabal-version:      2.2 name:               cachix-api-version: 0.5.0+version: 0.6.0 synopsis:           Servant HTTP API specification for https://cachix.org homepage:           https://github.com/cachix/cachix#readme bug-reports:        https://github.com/cachix/cachix/issues@@ -56,10 +56,10 @@   hs-source-dirs:  src   build-depends:     , aeson-    , base                 >=4.7    && <5+    , base                  >=4.7    && <5     , base16-bytestring     , bytestring-    , conduit              >=1.3.0+    , conduit               >=1.3.0     , cookie     , cryptonite     , deepseq@@ -72,9 +72,9 @@     , nix-narinfo     , protolude     , resourcet-    , servant              >=0.14.1+    , servant               >=0.14.1     , servant-auth-    , servant-auth-server+    , servant-auth-swagger     , servant-client     , string-conv     , swagger2@@ -105,7 +105,6 @@     , protolude     , servant                  >=0.14.1     , servant-auth-    , servant-auth-server     , servant-auth-swagger     , servant-swagger     , servant-swagger-ui-core

src/Cachix/API/Signing.hs view

@@ -14,7 +14,8 @@ import qualified Data.Conduit.Combinators as CC import Data.IORef import qualified Data.Text as T-import Protolude+import Protolude hiding (toS)+import Protolude.Conv  -- perl/lib/Nix/Manifest.pm:fingerprintPath -- NB: references must be sorted

src/Cachix/Types/NarInfo.hs view

@@ -10,13 +10,15 @@  import Data.Aeson (FromJSON, ToJSON) import Data.Swagger (ToSchema)-import Data.Text (Text) import Nix.NarInfo (NarInfo (..))+import Protolude  deriving instance ToSchema CachixNarInfo  deriving instance ToJSON CachixNarInfo  deriving instance FromJSON CachixNarInfo++deriving instance NFData CachixNarInfo  type CachixNarInfo = NarInfo Text Text Text

src/Cachix/Types/NixCacheInfo.hs view

@@ -10,4 +10,4 @@         wantMassQuery :: Integer,         priority :: Integer       }-  deriving (Generic, Show, FromJSON, ToJSON, ToSchema)+  deriving (Generic, Show, FromJSON, ToJSON, ToSchema, NFData)

src/Cachix/Types/Session.hs view

@@ -6,7 +6,7 @@  import qualified Crypto.JWT as JWT import Protolude-import Servant.Auth.Server (FromJWT (..), ToJWT (..))+import Servant.Auth.JWT (FromJWT (..), ToJWT (..))  data Session   = JWTSession JWT.ClaimsSet