cachix-api 0.1.0.2 → 0.1.0.3
raw patch · 4 files changed
+24/−48 lines, 4 files
Files
- ChangeLog.md +6/−0
- cachix-api.cabal +12/−45
- src/Cachix/Api/Types.hs +1/−0
- src/Cachix/Types/SwaggerOrphans.hs +5/−3
ChangeLog.md view
@@ -7,6 +7,12 @@ ## [Unreleased] +## [0.1.0.3] - 2018-11-27++### Changed++- Remove redundant orphan instance for swagger2-2.3.1 @domenkozar+ ## [0.1.0.2] - 2018-09-27 ### Changed
cachix-api.cabal view
@@ -1,13 +1,6 @@-cabal-version: 1.12---- This file has been generated from package.yaml by hpack version 0.31.0.------ see: https://github.com/sol/hpack------ hash: 5eaa9ab936f76cafce3bb324f6f2f2e22d928ac4a49316a827f9b859b06807d7-+cabal-version: 2.2 name: cachix-api-version: 0.1.0.2+version: 0.1.0.3 synopsis: Servant HTTP API specification for https://cachix.org homepage: https://github.com/cachix/cachix#readme bug-reports: https://github.com/cachix/cachix/issues@@ -17,15 +10,22 @@ license: Apache-2.0 license-file: LICENSE build-type: Simple+ extra-source-files:- README.md ChangeLog.md+ README.md +common defaults+ default-extensions: OverloadedStrings DeriveGeneric DeriveAnyClass+ ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -fwarn-tabs -fwarn-unused-imports -fwarn-missing-signatures -fwarn-name-shadowing -fwarn-incomplete-patterns+ default-language: Haskell2010+ source-repository head type: git location: https://github.com/cachix/cachix library+ import: defaults exposed-modules: Cachix.Api Cachix.Api.Signing@@ -36,12 +36,8 @@ Cachix.Types.Servant Cachix.Types.Session Cachix.Types.SwaggerOrphans- other-modules:- Paths_cachix_api hs-source-dirs: src- default-extensions: OverloadedStrings DeriveGeneric DeriveAnyClass- ghc-options: -Wall -fwarn-tabs -fwarn-unused-imports -fwarn-missing-signatures -fwarn-name-shadowing -fwarn-incomplete-patterns build-depends: aeson , amazonka@@ -66,53 +62,25 @@ , swagger2 , text , transformers- default-language: Haskell2010 executable cachix-gen-swagger+ import: defaults main-is: Main.hs- other-modules:- Paths_cachix_api hs-source-dirs: cachix-gen-swagger- default-extensions: OverloadedStrings DeriveGeneric DeriveAnyClass- ghc-options: -Wall -fwarn-tabs -fwarn-unused-imports -fwarn-missing-signatures -fwarn-name-shadowing -fwarn-incomplete-patterns -threaded -rtsopts -with-rtsopts=-N build-depends: aeson- , amazonka , base >=4.7 && <5- , base16-bytestring- , bytestring , cachix-api- , conduit >=1.3.0- , cookie- , cryptonite- , http-api-data- , http-media- , lens- , memory- , servant >=0.14.1- , servant-auth- , servant-auth-server- , servant-auth-swagger- , servant-streaming- , servant-swagger- , servant-swagger-ui-core- , string-conv- , swagger2- , text- , transformers- default-language: Haskell2010 test-suite cachix-api-test+ import: defaults type: exitcode-stdio-1.0 main-is: Main.hs other-modules: Spec- Paths_cachix_api hs-source-dirs: test- default-extensions: OverloadedStrings DeriveGeneric DeriveAnyClass- ghc-options: -Wall -fwarn-tabs -fwarn-unused-imports -fwarn-missing-signatures -fwarn-name-shadowing -fwarn-incomplete-patterns -threaded -rtsopts -with-rtsopts=-N build-depends: aeson , amazonka@@ -140,5 +108,4 @@ , swagger2 , text , transformers- default-language: Haskell2010 build-tool-depends: hspec-discover:hspec-discover
src/Cachix/Api/Types.hs view
@@ -49,6 +49,7 @@ { name :: Text , uri :: Text , publicSigningKeys :: [Text]+ , githubUsername :: Text } deriving (Show, Generic, FromJSON, ToJSON, ToSchema) newtype BinaryCacheCreate = BinaryCacheCreate
src/Cachix/Types/SwaggerOrphans.hs view
@@ -1,5 +1,6 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-# LANGUAGE DataKinds #-}+{-# LANGUAGE CPP #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-}@@ -15,10 +16,11 @@ import Servant.Auth.Swagger () import Web.Cookie (SetCookie) ---- TODO: https://github.com/haskell-servant/servant-auth/pull/42#issuecomment-381279499+#if MIN_VERSION_swagger2(2,3,1)+#else instance ToParamSchema SetCookie where- toParamSchema _ = mempty -- TODO: cookie instances for swagger+ toParamSchema _ = mempty+#endif -- https://github.com/plow-technologies/servant-streaming/blob/master/servant-streaming-docs/src/Servant/Streaming/Docs/Internal.hs -- TODO: these should define the body/response content