From 63e278db7e5d7e288cc49a34ff6542497bd8abdd Mon Sep 17 00:00:00 2001 From: Alejandro Serrano Date: Sat, 7 Jan 2023 21:26:23 +0100 Subject: [PATCH] Fix thingies --- .github/workflows/deploy.yml | 16 +- .github/workflows/haskell.yml | 8 +- adapter/avro/mu-avro.cabal | 8 +- adapter/kafka/mu-kafka.cabal | 2 +- adapter/protobuf/mu-protobuf.cabal | 7 +- adapter/protobuf/src/Mu/Quasi/GRpc.hs | 20 +- compendium-client/LICENSE | 202 --------------------- compendium-client/compendium-client.cabal | 36 ---- compendium-client/hie.yaml | 1 - compendium-client/src/Compendium/Client.hs | 86 --------- core/rpc/mu-rpc.cabal | 4 +- core/schema/mu-schema.cabal | 6 +- default.nix | 2 +- graphql/mu-graphql.cabal | 8 +- grpc/client/mu-grpc-client.cabal | 4 +- grpc/common/mu-grpc-common.cabal | 2 +- grpc/server/mu-grpc-server.cabal | 4 +- servant/server/mu-servant-server.cabal | 6 +- stack-nightly.yaml | 37 ++++ stack.yaml | 1 - 20 files changed, 76 insertions(+), 384 deletions(-) delete mode 100644 compendium-client/LICENSE delete mode 100644 compendium-client/compendium-client.cabal delete mode 100644 compendium-client/hie.yaml delete mode 100644 compendium-client/src/Compendium/Client.hs create mode 100644 stack-nightly.yaml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b2a6dfe4..7a72e767 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,20 +7,20 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v3.3.0 with: submodules: true - name: Unshallow run: git fetch --prune --unshallow - uses: serras/setup-stack@v3 - - uses: actions/cache@v2.1.3 + - uses: actions/cache@v3.2.2 name: Cache ~/.stack with: path: ~/.stack key: ${{ runner.os }}-stack-${{ hashFiles('stack.yaml') }} restore-keys: | ${{ runner.os }}-stack- - - uses: actions/cache@v2.1.3 + - uses: actions/cache@v3.2.2 name: Cache .stack-work with: path: .stack-work @@ -57,8 +57,8 @@ jobs: bundle install --gemfile docs/Gemfile BUNDLE_GEMFILE=./docs/Gemfile bundle exec jekyll build -b /mu-haskell/wip -s docs -d gen-docs/wip - name: Deploy microsite - uses: peaceiris/actions-gh-pages@v2 - env: - ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }} - PUBLISH_BRANCH: gh-pages - PUBLISH_DIR: ./gen-docs + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.ACTIONS_DEPLOY_KEY }} + publish_branch: gh-pages + publish_dir: ./gen-docs diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index d9125edf..c74da19f 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -4,17 +4,17 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v3.3.0 with: submodules: true - - uses: cachix/install-nix-action@v17 - - uses: cachix/cachix-action@v10 + - uses: cachix/install-nix-action@v18 + - uses: cachix/cachix-action@v11 with: name: 47deg signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' - run: nix-build - name: 'Set up HLint' - uses: rwe/actions-hlint-setup@v1.0.2 + uses: rwe/actions-hlint-setup@v1.0.3 - name: 'Run HLint' uses: rwe/actions-hlint-run@v2.0.1 with: diff --git a/adapter/avro/mu-avro.cabal b/adapter/avro/mu-avro.cabal index f8c83548..6cd20371 100644 --- a/adapter/avro/mu-avro.cabal +++ b/adapter/avro/mu-avro.cabal @@ -31,10 +31,10 @@ library Mu.Quasi.Avro.Example build-depends: - aeson >=1.4 && <2 + aeson >=1.4 && <2.1 , avro >=0.5.1 && <0.7 , base >=4.12 && <5 - , bytestring >=0.10 && <0.11 + , bytestring >=0.10 && <0.12 , containers >=0.6 && <0.7 , deepseq >=1.4 && <2 , language-avro >=0.1.3 && <0.2 @@ -42,7 +42,7 @@ library , mu-schema >=0.3 && <0.4 , sop-core >=0.5.0 && <0.6 , tagged >=0.8.6 && <0.9 - , template-haskell >=2.14 && <2.18 + , template-haskell >=2.14 && <2.19 , text >=1.2 && <2 , time >=1.9 && <2 , transformers >=0.5 && <0.6 @@ -59,7 +59,7 @@ executable test-avro build-depends: avro >=0.5.1 && <0.7 , base >=4.12 && <5 - , bytestring >=0.10 && <0.11 + , bytestring >=0.10 && <0.12 , containers >=0.6 && <0.7 , mu-avro , mu-schema >=0.3 && <0.4 diff --git a/adapter/kafka/mu-kafka.cabal b/adapter/kafka/mu-kafka.cabal index 2fa7ff3e..9400d926 100644 --- a/adapter/kafka/mu-kafka.cabal +++ b/adapter/kafka/mu-kafka.cabal @@ -31,7 +31,7 @@ library build-depends: avro >=0.5.1 && <0.7 , base >=4.12 && <5 - , bytestring >=0.10 && <0.11 + , bytestring >=0.10 && <0.12 , conduit >=1.3.2 && <2 , hw-kafka-client >=3 && <5 , hw-kafka-conduit >=2.7 && <3 diff --git a/adapter/protobuf/mu-protobuf.cabal b/adapter/protobuf/mu-protobuf.cabal index 9f6f66b8..5a7113c2 100644 --- a/adapter/protobuf/mu-protobuf.cabal +++ b/adapter/protobuf/mu-protobuf.cabal @@ -1,5 +1,5 @@ name: mu-protobuf -version: 0.4.2.0 +version: 0.4.3.0 synopsis: Protocol Buffers serialization and gRPC schema import for Mu microservices @@ -32,8 +32,7 @@ library build-depends: base >=4.12 && <5 - , bytestring >=0.10 && <0.11 - , compendium-client >=0.2 && <0.3 + , bytestring >=0.10 && <0.12 , containers >=0.6 && <0.7 , http-client >=0.6 && <0.8 , http2-grpc-proto3-wire >=0.1 && <0.2 @@ -43,7 +42,7 @@ library , proto3-wire >=1.1 && <2 , servant-client-core >=0.16 && <0.20 , sop-core >=0.5 && <0.6 - , template-haskell >=2.14 && <2.18 + , template-haskell >=2.14 && <2.19 , text >=1.2 && <2 hs-source-dirs: src diff --git a/adapter/protobuf/src/Mu/Quasi/GRpc.hs b/adapter/protobuf/src/Mu/Quasi/GRpc.hs index a7d19328..d099a8e5 100644 --- a/adapter/protobuf/src/Mu/Quasi/GRpc.hs +++ b/adapter/protobuf/src/Mu/Quasi/GRpc.hs @@ -6,13 +6,10 @@ Description : Quasi-quoters for gRPC files Read @.proto@ files as a 'Mu.Schema.Definition.Schema' -and a set of 'Service's. The origin of those @.proto@ -files can be local (if using 'grpc') or come -from a Compendium Registry (if using 'compendium'). +and a set of 'Service's. -} module Mu.Quasi.GRpc ( grpc -, compendium ) where import Control.Monad.IO.Class @@ -24,7 +21,6 @@ import qualified Language.ProtocolBuffers.Types as P import Network.HTTP.Client import Servant.Client.Core.BaseUrl -import Compendium.Client import Mu.Quasi.ProtoBuf import Mu.Rpc @@ -43,20 +39,6 @@ grpc schemaName servicePrefix fp Right p -> grpcToDecls schemaName servicePrefix p --- | Obtains a schema and service definition from Compendium, --- and generates the declarations from 'grpc'. -compendium :: String -> (String -> String) - -> String -> String -> Q [Dec] -compendium schemaTypeName servicePrefix baseUrl identifier - = do m <- liftIO $ newManager defaultManagerSettings - u <- liftIO $ parseBaseUrl baseUrl - r <- liftIO $ obtainProtoBuf m u (T.pack identifier) - case r of - Left e - -> fail ("could not parse protocol buffers spec: " ++ show e) - Right p - -> grpcToDecls schemaTypeName servicePrefix p - grpcToDecls :: String -> (String -> String) -> P.ProtoBuf -> Q [Dec] grpcToDecls schemaName servicePrefix p@P.ProtoBuf { P.package = pkg, P.services = srvs } = do let schemaName' = mkName schemaName diff --git a/compendium-client/LICENSE b/compendium-client/LICENSE deleted file mode 100644 index ffeb95d1..00000000 --- a/compendium-client/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright © 2019-2020 47 Degrees. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/compendium-client/compendium-client.cabal b/compendium-client/compendium-client.cabal deleted file mode 100644 index 249a0f9e..00000000 --- a/compendium-client/compendium-client.cabal +++ /dev/null @@ -1,36 +0,0 @@ -name: compendium-client -version: 0.2.1.1 -synopsis: Client for the Compendium schema server -description: - Client for the schema server - -license: Apache-2.0 -license-file: LICENSE -author: Alejandro Serrano, Flavio Corpa -maintainer: alejandro.serrano@47deg.com -copyright: Copyright © 2019-2020 -category: Network -build-type: Simple -cabal-version: >=1.10 -homepage: https://higherkindness.io/mu-haskell/ -bug-reports: https://github.com/higherkindness/mu-haskell/issues - -source-repository head - type: git - location: https://github.com/higherkindness/mu-haskell - -library - exposed-modules: Compendium.Client - build-depends: - aeson >=1.4 && <2 - , base >=4.12 && <5 - , http-client >=0.6.4 && <0.7 - , language-protobuf >=1.0.1 && <1.1 - , megaparsec >=8 && <10 - , servant >=0.16 && <0.20 - , servant-client >=0.16 && <0.20 - , text >=1.2 && <2 - - hs-source-dirs: src - default-language: Haskell2010 - ghc-options: -Wall -fprint-potential-instances diff --git a/compendium-client/hie.yaml b/compendium-client/hie.yaml deleted file mode 100644 index 6d0b5359..00000000 --- a/compendium-client/hie.yaml +++ /dev/null @@ -1 +0,0 @@ -cradle: { stack: { component: "compendium-client:lib" } } diff --git a/compendium-client/src/Compendium/Client.hs b/compendium-client/src/Compendium/Client.hs deleted file mode 100644 index 84fe5bd1..00000000 --- a/compendium-client/src/Compendium/Client.hs +++ /dev/null @@ -1,86 +0,0 @@ -{-# language DataKinds #-} -{-# language DeriveAnyClass #-} -{-# language DeriveGeneric #-} -{-# language TypeApplications #-} -{-# language TypeOperators #-} -{-# language ViewPatterns #-} -{-| -Description : Client for the Compendium schema registry - -Client for the Compendium schema registry --} -module Compendium.Client ( --- * Generic query of schemas - IdlName -, transformation --- * Query Protocol Buffer schemas -, obtainProtoBuf -, ObtainProtoBufError(..) -) where - -import Data.Aeson -import Data.Char -import Data.Proxy -import Data.Text -import Language.ProtocolBuffers.Parser -import Language.ProtocolBuffers.Types -import Network.HTTP.Client (Manager) -import Servant.API -import Servant.Client -import Text.Megaparsec - -import GHC.Generics - -newtype Protocol - = Protocol { raw :: Text } - deriving (Eq, Show, Generic, FromJSON) - --- | Interface Description Languages supported by Compendium. -data IdlName - = Avro | Protobuf | Mu | OpenApi | Scala - deriving (Eq, Show, Generic) -instance ToHttpApiData IdlName where - toQueryParam (show -> x:xs) - = pack $ Data.Char.toLower x : xs - toQueryParam _ = error "this should never happen" - -type TransformationAPI - = "protocol" :> Capture "id" Text - :> "transformation" - :> QueryParam' '[ Required ] "target" IdlName - :> Get '[JSON] Protocol - --- | Obtain a schema from the registry. -transformation :: Manager -- ^ Connection details (from 'http-client'). - -> BaseUrl -- ^ URL in which Compendium is running. - -> Text -- ^ Name that identifies the schema. - -> IdlName -- ^ Format of the returned schema. - -> IO (Either ClientError Text) -transformation m url ident idl - = runClientM (transformation' ident idl) (mkClientEnv m url) - -transformation' :: Text - -> IdlName - -> ClientM Text -transformation' ident idl - = raw <$> client (Proxy @TransformationAPI) ident idl - --- | Errors which may arise during 'obtainProtoBuf'. -data ObtainProtoBufError - = OPEClient ClientError -- ^ Error obtaining schema from Compendium - | OPEParse (ParseErrorBundle Text Char) -- ^ Obtaining the schema was OK, error parsing it - deriving (Show) - --- | Obtain a schema from the registry, --- and parse it as Protocol Buffers. -obtainProtoBuf :: Manager -> BaseUrl - -> Text -> IO (Either ObtainProtoBufError ProtoBuf) -obtainProtoBuf m url ident = do - r <- transformation m url ident Protobuf - case r of - Left e - -> pure $ Left (OPEClient e) - Right p - -> case parseProtoBuf p of - Left e -> pure $ Left (OPEParse e) - Right pb -> pure $ Right pb diff --git a/core/rpc/mu-rpc.cabal b/core/rpc/mu-rpc.cabal index 1948ecbe..f6ba7efc 100644 --- a/core/rpc/mu-rpc.cabal +++ b/core/rpc/mu-rpc.cabal @@ -29,14 +29,14 @@ library Mu.Server build-depends: - aeson >=1.4 && <2 + aeson >=1.4 && <2.1 , base >=4.12 && <5 , conduit >=1.3.2 && <1.4 , http-types >=0.12 && <0.13 , mtl >=2.2 && <2.3 , mu-schema >=0.3 && <0.4 , sop-core >=0.5 && <0.6 - , template-haskell >=2.14 && <2.18 + , template-haskell >=2.14 && <2.19 , text >=1.2 && <1.3 , wai >=3.2 && <4 diff --git a/core/schema/mu-schema.cabal b/core/schema/mu-schema.cabal index 0b3dd7c5..e38c0c31 100644 --- a/core/schema/mu-schema.cabal +++ b/core/schema/mu-schema.cabal @@ -38,13 +38,13 @@ library -- other-modules: -- other-extensions: build-depends: - aeson >=1.4 && <2 + aeson >=1.4 && <2.1 , base >=4.12 && <5 - , bytestring >=0.10 && <0.11 + , bytestring >=0.10 && <0.12 , containers >=0.6 && <0.7 , first-class-families >=0.8 && <0.9 , sop-core >=0.5 && <0.6 - , template-haskell >=2.14 && <2.18 + , template-haskell >=2.14 && <2.19 , text >=1.2 && <2 , th-abstraction >=0.3.2 && <0.5 , unordered-containers >=0.2 && <0.3 diff --git a/default.nix b/default.nix index 4e8642df..9bb0bc15 100644 --- a/default.nix +++ b/default.nix @@ -1,5 +1,5 @@ let - haskellNix = import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/fae257e.tar.gz) {}; + haskellNix = import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/c22fb2e.tar.gz) {}; nixpkgsSrc = haskellNix.sources.nixpkgs-2111; nixpkgsArgs = haskellNix.nixpkgsArgs; in diff --git a/graphql/mu-graphql.cabal b/graphql/mu-graphql.cabal index bd2b2d79..ce9776bc 100644 --- a/graphql/mu-graphql.cabal +++ b/graphql/mu-graphql.cabal @@ -29,10 +29,10 @@ library Mu.GraphQL.Subscription.Protocol build-depends: - aeson >=1.4 && <2 + aeson >=1.4 && <2.1 , async >=2.2 && <3 , base >=4.12 && <5 - , bytestring >=0.10 && <0.11 + , bytestring >=0.10 && <0.12 , conduit >=1.3.2 && <2 , foldl >=1.4 && <2 , graphql >=1 @@ -49,7 +49,7 @@ library , stm-chans >=3 && <4 , stm-conduit >=4 && <5 , stm-containers >=1.1 && <2 - , template-haskell >=2.14 && <2.18 + , template-haskell >=2.14 && <2.19 , text >=1.2 && <1.3 , unordered-containers >=0.2 && <0.3 , uuid >=1.3 && <2 @@ -70,7 +70,7 @@ executable library-graphql ghc-options: -Wall -threaded build-depends: base >=4.12 && <5 - , aeson >=1.4 && <2 + , aeson >=1.4 && <2.1 , conduit >=1.3.2 && <1.4 , mu-graphql , mu-rpc >=0.5 && <0.6 diff --git a/grpc/client/mu-grpc-client.cabal b/grpc/client/mu-grpc-client.cabal index b84235e1..d86fcb8e 100644 --- a/grpc/client/mu-grpc-client.cabal +++ b/grpc/client/mu-grpc-client.cabal @@ -32,7 +32,7 @@ library async >=2.2 && <3 , avro >=0.5.1 && <0.7 , base >=4.12 && <5 - , bytestring >=0.10 && <0.11 + , bytestring >=0.10 && <0.12 , conduit >=1.3.2 && <2 , http2 >=1.6 && <2.1 , http2-client >=0.9 && <1 @@ -48,7 +48,7 @@ library , stm >=2.5 && <3 , stm-chans >=3 && <4 , stm-conduit >=4 && <5 - , template-haskell >=2.14 && <2.18 + , template-haskell >=2.14 && <2.19 , text >=1.2 && <2 , th-abstraction >=0.3.2 && <0.5 , tracing >=0.0.5 diff --git a/grpc/common/mu-grpc-common.cabal b/grpc/common/mu-grpc-common.cabal index ecaa83e7..5e73f7f6 100644 --- a/grpc/common/mu-grpc-common.cabal +++ b/grpc/common/mu-grpc-common.cabal @@ -28,7 +28,7 @@ library avro >=0.5.1 && <0.7 , base >=4.12 && <5 , binary >=0.8 && <0.9 - , bytestring >=0.10 && <0.11 + , bytestring >=0.10 && <0.12 , http2-grpc-proto3-wire >=0.1 && <0.2 , http2-grpc-types >=0.5 && <0.6 , mu-avro >=0.4 && <0.5 diff --git a/grpc/server/mu-grpc-server.cabal b/grpc/server/mu-grpc-server.cabal index e91e5ab5..060a1374 100644 --- a/grpc/server/mu-grpc-server.cabal +++ b/grpc/server/mu-grpc-server.cabal @@ -27,7 +27,7 @@ library , avro >=0.5.1 && <0.7 , base >=4.12 && <5 , binary >=0.8 && <0.9 - , bytestring >=0.10 && <0.11 + , bytestring >=0.10 && <0.12 , conduit >=1.3.2 && <2 , http2-grpc-types >=0.5 && <0.6 , mtl >=2.2 && <3 @@ -54,7 +54,7 @@ executable grpc-example-server , avro >=0.5.1 && <0.7 , base >=4.12 && <5 , binary >=0.8 && <0.9 - , bytestring >=0.10 && <0.11 + , bytestring >=0.10 && <0.12 , conduit >=1.3.2 && <2 , http2-grpc-types >=0.5 && <0.6 , mtl >=2.2 && <3 diff --git a/servant/server/mu-servant-server.cabal b/servant/server/mu-servant-server.cabal index 3e0ea456..c17a9fb4 100644 --- a/servant/server/mu-servant-server.cabal +++ b/servant/server/mu-servant-server.cabal @@ -23,12 +23,12 @@ source-repository head library exposed-modules: Mu.Servant.Server build-depends: - aeson >=1.4 && <2 + aeson >=1.4 && <2.1 , async >=2.2 && <3 , base >=4.12 && <5 , conduit >=1.3.2 && <2 , generic-aeson >=0.2 && <0.3 - , ghc-prim >=0.5 && <0.8 + , ghc-prim >=0.5 && <0.9 , mtl >=2.2 && <3 , mu-rpc >=0.5 && <0.6 , mu-schema >=0.3 && <0.4 @@ -46,7 +46,7 @@ library executable servant-example-server main-is: ExampleServer.hs build-depends: - aeson >=1.4 && <2 + aeson >=1.4 && <2.1 , base >=4.12 && <5 , conduit >=1.3.2 && <2 , mu-rpc >=0.5 && <0.6 diff --git a/stack-nightly.yaml b/stack-nightly.yaml new file mode 100644 index 00000000..e9822743 --- /dev/null +++ b/stack-nightly.yaml @@ -0,0 +1,37 @@ +resolver: nightly-2022-09-23 +allow-newer: true + +packages: +- adapter/avro +- adapter/kafka +- adapter/persistent +- adapter/protobuf +- core/lens +- core/optics +- core/rpc +- core/schema +- examples/health-check +- examples/library/backend +- examples/route-guide +- examples/seed +- examples/todolist +- examples/with-persistent +- graphql +- grpc/client +- grpc/common +- grpc/server +- instrumentation/prometheus +- instrumentation/tracing +- servant/server + +extra-deps: +- http2-2.0.6 +- warp-3.3.14 +- http2-client-0.10.0.0 +- http2-client-grpc-0.8.0.0 +- http2-grpc-proto3-wire-0.1.0.0 +- http2-grpc-types-0.5.0.0 +- warp-grpc-0.4.0.1 +- hw-kafka-conduit-2.7.0 +- proto3-wire-1.4.0 +- graphql-1.0.3.0 diff --git a/stack.yaml b/stack.yaml index 372e1e0c..18f9a033 100644 --- a/stack.yaml +++ b/stack.yaml @@ -6,7 +6,6 @@ packages: - adapter/kafka - adapter/persistent - adapter/protobuf -- compendium-client - core/lens - core/optics - core/rpc