From b3e3a690aa5f886cc809e5d3922f8c22df499577 Mon Sep 17 00:00:00 2001 From: Daniel Firth Date: Fri, 9 Jul 2021 19:32:47 +0200 Subject: [PATCH] Update to stack nightly-2021-07-14 --- .../composite-aeson-path.cabal | 28 ++++++- .../composite-aeson-refined.cabal | 28 ++++++- composite-aeson/composite-aeson.cabal | 54 +++++++++++-- .../src/Composite/Aeson/Formats/Generic.hs | 4 +- .../src/Composite/Aeson/Formats/InternalTH.hs | 12 +++ composite-base/composite-base.cabal | 58 ++++++++++++-- composite-base/package.yaml | 2 +- composite-binary/composite-binary.cabal | 30 +++++-- composite-ekg/composite-ekg.cabal | 23 +++++- composite-hashable/composite-hashable.cabal | 28 ++++++- composite-opaleye/composite-opaleye.cabal | 40 ++++++++-- composite-swagger/composite-swagger.cabal | 40 ++++++++-- example/myawesomeserver.cabal | 4 +- stack-8.10.2.yaml => stack-8.10.4.yaml | 2 +- stack.yaml | 14 +++- stack.yaml.lock | 80 +++++++++++++++++-- 16 files changed, 387 insertions(+), 60 deletions(-) rename stack-8.10.2.yaml => stack-8.10.4.yaml (94%) diff --git a/composite-aeson-path/composite-aeson-path.cabal b/composite-aeson-path/composite-aeson-path.cabal index 340f649..363d4ab 100644 --- a/composite-aeson-path/composite-aeson-path.cabal +++ b/composite-aeson-path/composite-aeson-path.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.3. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 6cf5aa5a674723a2cb68f4070e600bc24a79d087b3b16eafb3268df4f4c3a0bf +-- hash: 1d79da1d24d68ea288af1013a75fec7f9f5348da279f1d56596f9f900d27c003 name: composite-aeson-path version: 0.7.5.0 @@ -25,10 +25,30 @@ library Paths_composite_aeson_path hs-source-dirs: src - default-extensions: DataKinds FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving LambdaCase MultiParamTypeClasses MultiWayIf OverloadedStrings PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeFamilies TypeOperators ViewPatterns + default-extensions: + DataKinds + FlexibleContexts + FlexibleInstances + GeneralizedNewtypeDeriving + LambdaCase + MultiParamTypeClasses + MultiWayIf + OverloadedStrings + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + StrictData + TemplateHaskell + TupleSections + TypeFamilies + TypeOperators + ViewPatterns ghc-options: -Wall -O2 build-depends: base >=4.7 && <5 - , composite-aeson >=0.7 && <0.8 + , composite-aeson ==0.7.* , path >=0.6 && <0.9 default-language: Haskell2010 diff --git a/composite-aeson-refined/composite-aeson-refined.cabal b/composite-aeson-refined/composite-aeson-refined.cabal index 2383f70..3f4cf75 100644 --- a/composite-aeson-refined/composite-aeson-refined.cabal +++ b/composite-aeson-refined/composite-aeson-refined.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.3. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: cc4c674145c73cbeecab0efb83fee3f018641398f412b114fdc3a3aa8b6405ad +-- hash: b1d426d112add047aa4759ae85d1a9350d360257d4e400f88355568f517e17b7 name: composite-aeson-refined version: 0.7.5.0 @@ -25,12 +25,32 @@ library Paths_composite_aeson_refined hs-source-dirs: src - default-extensions: DataKinds FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving LambdaCase MultiParamTypeClasses MultiWayIf OverloadedStrings PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeFamilies TypeOperators ViewPatterns + default-extensions: + DataKinds + FlexibleContexts + FlexibleInstances + GeneralizedNewtypeDeriving + LambdaCase + MultiParamTypeClasses + MultiWayIf + OverloadedStrings + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + StrictData + TemplateHaskell + TupleSections + TypeFamilies + TypeOperators + ViewPatterns ghc-options: -Wall -O2 build-depends: aeson-better-errors >=0.9.1.0 && <0.10 , base >=4.7 && <5 - , composite-aeson >=0.7 && <0.8 + , composite-aeson ==0.7.* , mtl >=2.2.1 && <2.3 , refined >=0.1.2.1 && <0.7 default-language: Haskell2010 diff --git a/composite-aeson/composite-aeson.cabal b/composite-aeson/composite-aeson.cabal index 90e9eeb..9f35f90 100644 --- a/composite-aeson/composite-aeson.cabal +++ b/composite-aeson/composite-aeson.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.3. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 5ed294fd597a5fe41cec4edea20e59e45dc7d5f01b64ad8f078ef75e5e748468 +-- hash: 9799d7d973d1391e13276302ab02649777bd38c083579b00223e57580505bc62 name: composite-aeson version: 0.7.5.0 @@ -36,13 +36,34 @@ library Paths_composite_aeson hs-source-dirs: src - default-extensions: DataKinds FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving LambdaCase MultiParamTypeClasses MultiWayIf OverloadedStrings PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeApplications TypeFamilies TypeOperators ViewPatterns + default-extensions: + DataKinds + FlexibleContexts + FlexibleInstances + GeneralizedNewtypeDeriving + LambdaCase + MultiParamTypeClasses + MultiWayIf + OverloadedStrings + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + StrictData + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeOperators + ViewPatterns ghc-options: -Wall -O2 build-depends: aeson >=1.1.2.0 && <1.6 , aeson-better-errors >=0.9.1.0 && <0.10 , base >=4.7 && <5 - , composite-base >=0.7 && <0.8 + , composite-base ==0.7.* , containers >=0.5.7.0 && <0.7 , contravariant >=1.4 && <1.6 , generic-deriving >=1.11.2 && <1.14 @@ -74,7 +95,28 @@ test-suite composite-aeson-test Paths_composite_aeson hs-source-dirs: test - default-extensions: DataKinds FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving LambdaCase MultiParamTypeClasses MultiWayIf OverloadedStrings PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeApplications TypeFamilies TypeOperators ViewPatterns + default-extensions: + DataKinds + FlexibleContexts + FlexibleInstances + GeneralizedNewtypeDeriving + LambdaCase + MultiParamTypeClasses + MultiWayIf + OverloadedStrings + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + StrictData + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeOperators + ViewPatterns ghc-options: -Wall -O2 -threaded -rtsopts -with-rtsopts=-N -fno-warn-orphans build-depends: QuickCheck @@ -83,7 +125,7 @@ test-suite composite-aeson-test , aeson-qq , base >=4.7 && <5 , composite-aeson - , composite-base >=0.7 && <0.8 + , composite-base ==0.7.* , containers >=0.5.7.0 && <0.7 , contravariant >=1.4 && <1.6 , generic-deriving >=1.11.2 && <1.14 diff --git a/composite-aeson/src/Composite/Aeson/Formats/Generic.hs b/composite-aeson/src/Composite/Aeson/Formats/Generic.hs index 331f692..e00a234 100644 --- a/composite-aeson/src/Composite/Aeson/Formats/Generic.hs +++ b/composite-aeson/src/Composite/Aeson/Formats/Generic.hs @@ -153,8 +153,8 @@ instance Lift SumStyle where SumStyleFieldName -> [| SumStyleFieldName |] SumStyleTypeValue a b -> [| SumStyleTypeValue $(liftString $ unpack a) $(liftString $ unpack b) |] SumStyleMergeType a -> [| SumStyleMergeType $(liftString $ unpack a) |] -#if MIN_VERSION_template_haskell(2,16,0) - liftTyped = fmap TExp . lift +#if MIN_VERSION_template_haskell(2,17,0) +#elif MIN_VERSION_template_haskell(2,16,0) #endif diff --git a/composite-aeson/src/Composite/Aeson/Formats/InternalTH.hs b/composite-aeson/src/Composite/Aeson/Formats/InternalTH.hs index e436ae3..a453a26 100644 --- a/composite-aeson/src/Composite/Aeson/Formats/InternalTH.hs +++ b/composite-aeson/src/Composite/Aeson/Formats/InternalTH.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} module Composite.Aeson.Formats.InternalTH ( makeTupleDefaults, makeTupleFormats, makeNamedTupleFormats ) where @@ -20,6 +21,9 @@ import Language.Haskell.TH , bindS, noBindS , Type(AppT, ArrowT, ConT, ForallT, TupleT, VarT), appT, conT, varT , TyVarBndr(PlainTV) +#if MIN_VERSION_template_haskell(2,17,0) + , Specificity(SpecifiedSpec) +#endif ) import Language.Haskell.TH.Syntax (lift) @@ -64,7 +68,11 @@ makeTupleFormats = concat <$> traverse makeTupleFormat [2..59] tupleType = foldl' AppT (TupleT arity) (map VarT tyNames) funType = ForallT +#if MIN_VERSION_template_haskell(2,17,0) + (PlainTV tyErrName SpecifiedSpec : map (flip PlainTV SpecifiedSpec) tyNames) +#else (PlainTV tyErrName : map PlainTV tyNames) +#endif [] (foldr (\ tyName rest -> ArrowT `AppT` (ConT ''JsonFormat `AppT` VarT tyErrName `AppT` tyName) `AppT` rest) (ConT ''JsonFormat `AppT` VarT tyErrName `AppT` tupleType) @@ -116,7 +124,11 @@ makeNamedTupleFormats = concat <$> traverse makeNamedTupleFormat [2..59] tupleType = foldl' AppT (TupleT arity) (map VarT tyNames) funType = ForallT +#if MIN_VERSION_template_haskell(2,17,0) + (PlainTV tyErrName SpecifiedSpec : map (flip PlainTV SpecifiedSpec) tyNames) +#else (PlainTV tyErrName : map PlainTV tyNames) +#endif [] (foldr (\ tyName rest -> ArrowT `AppT` ConT ''Text `AppT` (ArrowT `AppT` (ConT ''JsonFormat `AppT` VarT tyErrName `AppT` tyName) `AppT` rest)) (ConT ''JsonFormat `AppT` VarT tyErrName `AppT` tupleType) diff --git a/composite-base/composite-base.cabal b/composite-base/composite-base.cabal index 8d14eca..035fdcc 100644 --- a/composite-base/composite-base.cabal +++ b/composite-base/composite-base.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.3. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: afc6990732690309917603d2a17b1c010034e560db9f68dcb358fe45bf7f0cb0 +-- hash: 3760bb562aa001b62693b1a573a15835800242a6d9b176a2f2345a091fb7283a name: composite-base version: 0.7.5.0 @@ -29,11 +29,34 @@ library Paths_composite_base hs-source-dirs: src - default-extensions: ConstraintKinds DataKinds FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving MultiParamTypeClasses NamedFieldPuns OverloadedStrings PatternSynonyms PolyKinds RankNTypes RecordWildCards ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeApplications TypeFamilies TypeOperators ViewPatterns + default-extensions: + ConstraintKinds + DataKinds + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + GeneralizedNewtypeDeriving + MultiParamTypeClasses + NamedFieldPuns + OverloadedStrings + PatternSynonyms + PolyKinds + RankNTypes + RecordWildCards + ScopedTypeVariables + StandaloneDeriving + StrictData + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeOperators + ViewPatterns ghc-options: -Wall -O2 build-depends: base >=4.7 && <5 - , deepseq >=1.4 && <1.5 + , deepseq ==1.4.* , exceptions >=0.8.3 && <0.11 , lens >=4.15.4 && <5.1 , monad-control >=1.0.2.2 && <1.1 @@ -56,13 +79,36 @@ test-suite composite-base-test Paths_composite_base hs-source-dirs: test - default-extensions: ConstraintKinds DataKinds FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving MultiParamTypeClasses NamedFieldPuns OverloadedStrings PatternSynonyms PolyKinds RankNTypes RecordWildCards ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeApplications TypeFamilies TypeOperators ViewPatterns + default-extensions: + ConstraintKinds + DataKinds + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + GeneralizedNewtypeDeriving + MultiParamTypeClasses + NamedFieldPuns + OverloadedStrings + PatternSynonyms + PolyKinds + RankNTypes + RecordWildCards + ScopedTypeVariables + StandaloneDeriving + StrictData + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeOperators + ViewPatterns ghc-options: -Wall -O2 -threaded -rtsopts -with-rtsopts=-N -fno-warn-orphans build-depends: QuickCheck , base >=4.7 && <5 , composite-base - , deepseq >=1.4 && <1.5 + , deepseq ==1.4.* , exceptions >=0.8.3 && <0.11 , hspec , lens >=4.15.4 && <5.1 diff --git a/composite-base/package.yaml b/composite-base/package.yaml index c3cb370..e0835dc 100644 --- a/composite-base/package.yaml +++ b/composite-base/package.yaml @@ -17,7 +17,7 @@ dependencies: - monad-control >= 1.0.2.2 && < 1.1 - mtl >= 2.2.1 && < 2.3 - profunctors >= 5.2.1 && < 5.7 - - template-haskell >= 2.11.1.0 && < 2.17 + - template-haskell >= 2.11.1.0 && < 2.18 - text >= 1.2.2.2 && < 1.3 - transformers >= 0.5.2.0 && < 0.6 - transformers-base >= 0.4.4 && < 0.5 diff --git a/composite-binary/composite-binary.cabal b/composite-binary/composite-binary.cabal index 8262b59..2b736b9 100644 --- a/composite-binary/composite-binary.cabal +++ b/composite-binary/composite-binary.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.3. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: f638fa0382ddb7ad13e47f4009f160d3c4729b52b64d2ab24e505c7ddcd8b5ec +-- hash: 9bc5c7d2f8bfc9b2ccee3bf0bfe1324a586eaf6ac077a66b18c2dc3435e0cebc name: composite-binary version: 0.7.5.0 @@ -25,10 +25,30 @@ library Paths_composite_binary hs-source-dirs: src - default-extensions: DataKinds FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving LambdaCase MultiParamTypeClasses MultiWayIf OverloadedStrings PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeFamilies TypeOperators ViewPatterns + default-extensions: + DataKinds + FlexibleContexts + FlexibleInstances + GeneralizedNewtypeDeriving + LambdaCase + MultiParamTypeClasses + MultiWayIf + OverloadedStrings + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + StrictData + TemplateHaskell + TupleSections + TypeFamilies + TypeOperators + ViewPatterns ghc-options: -Wall -O2 build-depends: base >=4.7 && <5 - , binary >=0.8 && <0.9 - , composite-base >=0.7 && <0.8 + , binary ==0.8.* + , composite-base ==0.7.* default-language: Haskell2010 diff --git a/composite-ekg/composite-ekg.cabal b/composite-ekg/composite-ekg.cabal index bd6246c..6d4fd4f 100644 --- a/composite-ekg/composite-ekg.cabal +++ b/composite-ekg/composite-ekg.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.3. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 20afb3252af62b7416ffba6541162eebaaf541deef84c22cffe72b44010002dd +-- hash: b96b2bf667e8a94cc65b5b18e04872852a1c0db28768d620338b87138a4c7b3c name: composite-ekg version: 0.7.5.0 @@ -25,11 +25,26 @@ library Paths_composite_ekg hs-source-dirs: src - default-extensions: DataKinds FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving MultiParamTypeClasses OverloadedStrings PolyKinds ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeFamilies TypeOperators ViewPatterns + default-extensions: + DataKinds + FlexibleContexts + FlexibleInstances + GeneralizedNewtypeDeriving + MultiParamTypeClasses + OverloadedStrings + PolyKinds + ScopedTypeVariables + StandaloneDeriving + StrictData + TemplateHaskell + TupleSections + TypeFamilies + TypeOperators + ViewPatterns ghc-options: -Wall -O2 build-depends: base >=4.7 && <5 - , composite-base >=0.7 && <0.8 + , composite-base ==0.7.* , ekg-core >=0.1.1.3 && <0.5 , lens >=4.15.4 && <5.1 , text >=1.2.2.2 && <1.3 diff --git a/composite-hashable/composite-hashable.cabal b/composite-hashable/composite-hashable.cabal index 0e3bf1c..4264e33 100644 --- a/composite-hashable/composite-hashable.cabal +++ b/composite-hashable/composite-hashable.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.3. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: cb16fb3fdafcd7c95077eaf450ce04948e2d7145c43d5d31484f9f639b411b1c +-- hash: e4fdcd9467c1bef1179c6d485bd8e8364484b985486e7356e8bbbb8a6b84de76 name: composite-hashable version: 0.7.5.0 @@ -25,10 +25,30 @@ library Paths_composite_hashable hs-source-dirs: src - default-extensions: DataKinds FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving LambdaCase MultiParamTypeClasses MultiWayIf OverloadedStrings PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeFamilies TypeOperators ViewPatterns + default-extensions: + DataKinds + FlexibleContexts + FlexibleInstances + GeneralizedNewtypeDeriving + LambdaCase + MultiParamTypeClasses + MultiWayIf + OverloadedStrings + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + StrictData + TemplateHaskell + TupleSections + TypeFamilies + TypeOperators + ViewPatterns ghc-options: -Wall -O2 build-depends: base >=4.7 && <5 - , composite-base >=0.7 && <0.8 + , composite-base ==0.7.* , hashable >=1.1.1 && <1.4 default-language: Haskell2010 diff --git a/composite-opaleye/composite-opaleye.cabal b/composite-opaleye/composite-opaleye.cabal index e3ae66a..16aba07 100644 --- a/composite-opaleye/composite-opaleye.cabal +++ b/composite-opaleye/composite-opaleye.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.3. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: c5abc76a7091a2517c06a939e760e276896cb09f8e4ac592c42b7048378054d4 +-- hash: 087ee6a017cf6af1d77c59143c822862ed97d230372de8bec6087271fcdcf7f7 name: composite-opaleye version: 0.7.5.0 @@ -30,12 +30,26 @@ library Paths_composite_opaleye hs-source-dirs: src - default-extensions: DataKinds FlexibleContexts FlexibleInstances LambdaCase MultiParamTypeClasses OverloadedStrings PatternSynonyms PolyKinds ScopedTypeVariables StrictData TemplateHaskell TypeFamilies TypeOperators ViewPatterns + default-extensions: + DataKinds + FlexibleContexts + FlexibleInstances + LambdaCase + MultiParamTypeClasses + OverloadedStrings + PatternSynonyms + PolyKinds + ScopedTypeVariables + StrictData + TemplateHaskell + TypeFamilies + TypeOperators + ViewPatterns ghc-options: -Wall -O2 build-depends: base >=4.7 && <5 , bytestring >=0.10.8.1 && <0.11 - , composite-base >=0.7 && <0.8 + , composite-base ==0.7.* , lens >=4.15.4 && <5.1 , opaleye >=0.5.4.0 && <0.8 , postgresql-simple >=0.5.3.0 && <0.7 @@ -54,13 +68,27 @@ test-suite composite-opaleye-test Paths_composite_opaleye hs-source-dirs: test - default-extensions: DataKinds FlexibleContexts FlexibleInstances LambdaCase MultiParamTypeClasses OverloadedStrings PatternSynonyms PolyKinds ScopedTypeVariables StrictData TemplateHaskell TypeFamilies TypeOperators ViewPatterns + default-extensions: + DataKinds + FlexibleContexts + FlexibleInstances + LambdaCase + MultiParamTypeClasses + OverloadedStrings + PatternSynonyms + PolyKinds + ScopedTypeVariables + StrictData + TemplateHaskell + TypeFamilies + TypeOperators + ViewPatterns ghc-options: -Wall -O2 -threaded -rtsopts -with-rtsopts=-N -fno-warn-orphans build-depends: QuickCheck , base >=4.7 && <5 , bytestring >=0.10.8.1 && <0.11 - , composite-base >=0.7 && <0.8 + , composite-base ==0.7.* , composite-opaleye , hspec , lens >=4.15.4 && <5.1 diff --git a/composite-swagger/composite-swagger.cabal b/composite-swagger/composite-swagger.cabal index 8e06031..b651c0a 100644 --- a/composite-swagger/composite-swagger.cabal +++ b/composite-swagger/composite-swagger.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.3. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: c4df88e01bce6b24d15c6eb28e92ca3fd245f971e10e28dfe2abb8007f783419 +-- hash: 3521951d340bbbe72b7b6a44adce8b897bd4403c9a77da019f6d3e253559b234 name: composite-swagger version: 0.7.5.0 @@ -28,11 +28,26 @@ library Paths_composite_swagger hs-source-dirs: src - default-extensions: DataKinds FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving MultiParamTypeClasses OverloadedStrings PolyKinds ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeFamilies TypeOperators ViewPatterns + default-extensions: + DataKinds + FlexibleContexts + FlexibleInstances + GeneralizedNewtypeDeriving + MultiParamTypeClasses + OverloadedStrings + PolyKinds + ScopedTypeVariables + StandaloneDeriving + StrictData + TemplateHaskell + TupleSections + TypeFamilies + TypeOperators + ViewPatterns ghc-options: -Wall -O2 build-depends: base >=4.7 && <5 - , composite-base >=0.7 && <0.8 + , composite-base ==0.7.* , insert-ordered-containers >=0.2.1.0 && <0.3 , lens >=4.15.4 && <5.1 , swagger2 >=2.1.6 && <2.7 @@ -49,7 +64,22 @@ test-suite composite-swagger-test Paths_composite_swagger hs-source-dirs: test - default-extensions: DataKinds FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving MultiParamTypeClasses OverloadedStrings PolyKinds ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeFamilies TypeOperators ViewPatterns + default-extensions: + DataKinds + FlexibleContexts + FlexibleInstances + GeneralizedNewtypeDeriving + MultiParamTypeClasses + OverloadedStrings + PolyKinds + ScopedTypeVariables + StandaloneDeriving + StrictData + TemplateHaskell + TupleSections + TypeFamilies + TypeOperators + ViewPatterns ghc-options: -Wall -O2 -threaded -rtsopts -with-rtsopts=-N -fno-warn-orphans build-depends: QuickCheck diff --git a/example/myawesomeserver.cabal b/example/myawesomeserver.cabal index 995739e..146fe54 100644 --- a/example/myawesomeserver.cabal +++ b/example/myawesomeserver.cabal @@ -77,7 +77,7 @@ library , opaleye >=0.5.4.0 && <0.8 , postgresql-simple >=0.5.3.0 && <0.7 , product-profunctors >=0.8.0.3 && <0.12 - , profunctors >=5.2.1 && <5.6 + , profunctors >=5.2.1 && <5.7 , resource-pool >=0.2.3.2 && <0.3 , servant >=0.11 && <0.19 , servant-server >=0.11.0.1 && <0.19 @@ -144,7 +144,7 @@ executable myawesomeserver-exe , opaleye >=0.5.4.0 && <0.8 , postgresql-simple >=0.5.3.0 && <0.7 , product-profunctors >=0.8.0.3 && <0.12 - , profunctors >=5.2.1 && <5.6 + , profunctors >=5.2.1 && <5.7 , resource-pool >=0.2.3.2 && <0.3 , servant >=0.11 && <0.19 , servant-server >=0.11.0.1 && <0.19 diff --git a/stack-8.10.2.yaml b/stack-8.10.4.yaml similarity index 94% rename from stack-8.10.2.yaml rename to stack-8.10.4.yaml index 03666b2..e07aebc 100644 --- a/stack-8.10.2.yaml +++ b/stack-8.10.4.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2020-10-09 +resolver: lts-18.2 packages: - composite-aeson - composite-aeson-path diff --git a/stack.yaml b/stack.yaml index 40197a8..07a9799 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2021-04-06 +resolver: nightly-2021-07-14 packages: - composite-aeson - composite-aeson-path @@ -12,8 +12,18 @@ packages: - example flags: {} extra-deps: -- lens-5.0.1 +- ekg-0.4.0.15 +- ekg-core-0.1.1.7 +- ekg-json-0.1.0.6 +- io-streams-haproxy-1.0.1.0 - opaleye-0.6.7006.1 +- servant-swagger-1.1.10 +- snap-server-1.1.2.0 +- these-skinny-0.7.4 +- git: https://github.com/locallycompact/refined + commit: 5cbb5cb6882552d2bc1dca1c48c6ee1a69d6e292 +- git: https://github.com/locallycompact/swagger2 + commit: 64bc206294b8659892c00c5bc955810b4aa598b4 allow-newer: true nix: packages: diff --git a/stack.yaml.lock b/stack.yaml.lock index 272397e..a67f6dd 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -5,12 +5,33 @@ packages: - completed: - hackage: lens-5.0.1@sha256:d44156c542b1630337a07cac5824f1846badeb59043adbe8c4e9ed1da89cc13d,15026 + hackage: ekg-0.4.0.15@sha256:d6e48859a89fbbe23496f871581e44a41f97dac627c2b9db81f49b92fa066516,2031 pantry-tree: - size: 8291 - sha256: 017fcde6fd1f792bc7509375c8aacbbd09b62f16b215e1ae3a261aa642b564b0 + size: 1495 + sha256: e56e9c0eadc309a27400af106a2d3133d70ad0a3bbbb9be2c54e837ccdb4a77d original: - hackage: lens-5.0.1 + hackage: ekg-0.4.0.15@sha256:d6e48859a89fbbe23496f871581e44a41f97dac627c2b9db81f49b92fa066516,2031 +- completed: + hackage: ekg-core-0.1.1.7@sha256:c4356aefea0e1e2f80a236d3b3f81b83b445c1e53519302e96477da0adee2e9f,2039 + pantry-tree: + size: 1073 + sha256: f403baeb7787c69c5e28f5aa1e94f78d4363beb19362d66f18de4a1aef0723fe + original: + hackage: ekg-core-0.1.1.7@sha256:c4356aefea0e1e2f80a236d3b3f81b83b445c1e53519302e96477da0adee2e9f,2039 +- completed: + hackage: ekg-json-0.1.0.6@sha256:e16efc1b09ae7635db3f0535335ee3e8aa666fe4bf3749783f4022020f6ca3b8,1050 + pantry-tree: + size: 265 + sha256: 09239a4e3ab0d58be0ac360d41c491df017f4a18ba558fd67909e24f14caece7 + original: + hackage: ekg-json-0.1.0.6@sha256:e16efc1b09ae7635db3f0535335ee3e8aa666fe4bf3749783f4022020f6ca3b8,1050 +- completed: + hackage: io-streams-haproxy-1.0.1.0@sha256:fd6c585c46679752509df185c9d8f948d1ee03625005742ab5de3ebaa882690a,3084 + pantry-tree: + size: 589 + sha256: 33c420a00acd8e86924fca0a713c658e5da4acc071b170907e81c07eb8bc0dac + original: + hackage: io-streams-haproxy-1.0.1.0@sha256:fd6c585c46679752509df185c9d8f948d1ee03625005742ab5de3ebaa882690a,3084 - completed: hackage: opaleye-0.6.7006.1@sha256:06c8d8808aedabb065ce26387285b5f2d3320b801f818899cced186dc645dc34,5725 pantry-tree: @@ -18,9 +39,52 @@ packages: sha256: 6a2d72804e9d87e1a9afe280a2a49838ee7771e640a4ef429c3b52e41f9c44c4 original: hackage: opaleye-0.6.7006.1 +- completed: + hackage: servant-swagger-1.1.10@sha256:ca3237516f11cb4d28fff6ec0991b9dc765456a3985df3fb469641fb5c742c5a,4623 + pantry-tree: + size: 1636 + sha256: 83536669b525e5c6ff3368698bcdbeec55858b713642575f88d3c3b52d0bf380 + original: + hackage: servant-swagger-1.1.10@sha256:ca3237516f11cb4d28fff6ec0991b9dc765456a3985df3fb469641fb5c742c5a,4623 +- completed: + hackage: snap-server-1.1.2.0@sha256:3167b836a0b0ee49c8d6c973535c33f583c9ef9ba62d9723f08509b38368cb8f,14641 + pantry-tree: + size: 3313 + sha256: adc437085565401e935067062ddfb6d13b423d3820a9f10f01fcb9e64ab09445 + original: + hackage: snap-server-1.1.2.0@sha256:3167b836a0b0ee49c8d6c973535c33f583c9ef9ba62d9723f08509b38368cb8f,14641 +- completed: + hackage: these-skinny-0.7.4@sha256:e29336a1a70a497e09d8266f8438efb30a807bafaa6b00f5a136f7493efb3160,1239 + pantry-tree: + size: 262 + sha256: 77f01554e40d8e910d00f95c35dde86df4f691e2955d9afdc16508114c4d1af2 + original: + hackage: these-skinny-0.7.4@sha256:e29336a1a70a497e09d8266f8438efb30a807bafaa6b00f5a136f7493efb3160,1239 +- completed: + name: refined + version: 0.6.2 + git: https://github.com/locallycompact/refined + pantry-tree: + size: 831 + sha256: 62945f9d3e418d6fd06dfe9b4227cdf83ad2af6b7c448f3f71886af70c635bd0 + commit: 5cbb5cb6882552d2bc1dca1c48c6ee1a69d6e292 + original: + git: https://github.com/locallycompact/refined + commit: 5cbb5cb6882552d2bc1dca1c48c6ee1a69d6e292 +- completed: + name: swagger2 + version: 2.6.1 + git: https://github.com/locallycompact/swagger2 + pantry-tree: + size: 2451 + sha256: 8b59662759ed8cd22e9f4a74d84be540938e3fd1af0161e78ac0fa429cb8871b + commit: 64bc206294b8659892c00c5bc955810b4aa598b4 + original: + git: https://github.com/locallycompact/swagger2 + commit: 64bc206294b8659892c00c5bc955810b4aa598b4 snapshots: - completed: - size: 576531 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2021/4/6.yaml - sha256: 6ce168aed6ba23cfe148061587ba1c0f24a09d4cad8b1a5a29b21878e33d6ef4 - original: nightly-2021-04-06 + size: 555978 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2021/7/14.yaml + sha256: 2005455f5d812ceb95560b708f006157533714bef631af52a3dd678d7dde32aa + original: nightly-2021-07-14