WIP: Update to stack nightly-2021-07-14

composite-aeson-path/composite-aeson-path.cabal

@@ -3,8 +3,6 @@ cabal-version: 1.12
 -- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: a4066140c496fecb26e6cfeeff88c4087efdba2a3c2bdb079826114af9895eb9
 
 name:           composite-aeson-path
 version:        0.7.5.0
@@ -50,5 +48,5 @@ library
   build-depends:
       base >=4.12 && <5
     , composite-aeson ==0.7.*
-    , path >=0.6 && <0.9
+    , path >=0.6 && <0.10
   default-language: Haskell2010

composite-aeson-path/package.yaml

@@ -11,7 +11,7 @@ category:            Records
 
 dependencies:
   - base >= 4.12 && < 5
-  - path >= 0.6 && < 0.9
+  - path >= 0.6 && < 0.10
   - composite-aeson >= 0.7 && < 0.8
 
 default-extensions:

composite-aeson-refined/composite-aeson-refined.cabal

@@ -3,8 +3,6 @@ cabal-version: 1.12
 -- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 4e1131b3777a8c511a2d35d07dd82508bb402d0db1a7cda4b2d25f4829fad8cc
 
 name:           composite-aeson-refined
 version:        0.7.5.0
@@ -49,7 +47,7 @@ library
   ghc-options: -Wall -O2
   build-depends:
       aeson-better-errors >=0.9.1.0 && <0.10
-    , base >=4.12 && <5
+    , base >=4.12 && <4.16
     , composite-aeson ==0.7.*
     , mtl >=2.2.1 && <2.3
     , refined >=0.1.2.1 && <0.7

composite-aeson-refined/package.yaml

@@ -10,7 +10,7 @@ copyright:           2017 Confer Health, Inc., 2020-2021 Vital Biosciences
 category:            Records
 
 dependencies:
-  - base >= 4.12 && < 5
+  - base >= 4.12 && < 4.16
   - aeson-better-errors >= 0.9.1.0 && < 0.10
   - composite-aeson >= 0.7 && < 0.8
   - mtl >= 2.2.1 && < 2.3

composite-aeson/composite-aeson.cabal

@@ -3,8 +3,6 @@ cabal-version: 1.12
 -- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: c527166c37e70d59b1575a743e5716d678130dc8efeac1783f5e533f73c6f6a2
 
 name:           composite-aeson
 version:        0.7.5.0
@@ -66,15 +64,15 @@ library
     , composite-base ==0.7.*
     , containers >=0.5.7.0 && <0.7
     , contravariant >=1.4 && <1.6
-    , generic-deriving >=1.11.2 && <1.14
+    , generic-deriving >=1.11.2 && <1.15
     , hashable >=1.2.6.1 && <1.4
     , lens >=4.15.4 && <5.1
     , mmorph >=1.0.9 && <1.2
     , mtl >=2.2.1 && <2.3
     , profunctors >=5.2.1 && <5.7
     , scientific >=0.3.5.1 && <0.4
     , tagged >=0.8.5 && <0.9
-    , template-haskell >=2.11.1.0 && <2.17
+    , template-haskell >=2.11.1.0 && <2.18
     , text >=1.2.2.2 && <1.3
     , time >=1.6.0.1 && <1.10
     , unordered-containers >=0.2.8.0 && <0.3
@@ -128,7 +126,7 @@ test-suite composite-aeson-test
     , composite-base ==0.7.*
     , containers >=0.5.7.0 && <0.7
     , contravariant >=1.4 && <1.6
-    , generic-deriving >=1.11.2 && <1.14
+    , generic-deriving >=1.11.2 && <1.15
     , hashable >=1.2.6.1 && <1.4
     , hspec
     , lens >=4.15.4 && <5.1
@@ -137,7 +135,7 @@ test-suite composite-aeson-test
     , profunctors >=5.2.1 && <5.7
     , scientific >=0.3.5.1 && <0.4
     , tagged >=0.8.5 && <0.9
-    , template-haskell >=2.11.1.0 && <2.17
+    , template-haskell >=2.11.1.0 && <2.18
     , text >=1.2.2.2 && <1.3
     , time >=1.6.0.1 && <1.10
     , unordered-containers >=0.2.8.0 && <0.3

composite-aeson/package.yaml

@@ -16,15 +16,15 @@ dependencies:
   - composite-base >= 0.7 && < 0.8
   - containers >= 0.5.7.0 && < 0.7
   - contravariant >= 1.4 && < 1.6
-  - generic-deriving >= 1.11.2 && < 1.14
+  - generic-deriving >= 1.11.2 && < 1.15
   - hashable >= 1.2.6.1 && < 1.4
   - lens >= 4.15.4 && < 5.1
   - mmorph >= 1.0.9 && < 1.2
   - mtl >= 2.2.1 && < 2.3
   - profunctors >= 5.2.1 && < 5.7
   - scientific >= 0.3.5.1 && < 0.4
   - tagged >= 0.8.5 && < 0.9
-  - template-haskell >= 2.11.1.0 && < 2.17
+  - template-haskell >= 2.11.1.0 && < 2.18
   - text >= 1.2.2.2 && < 1.3
   - time >= 1.6.0.1 && < 1.10
   - unordered-containers >= 0.2.8.0 && < 0.3

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
 
 

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)

composite-base/composite-base.cabal

@@ -3,8 +3,6 @@ cabal-version: 1.12
 -- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: f5caba9cc5d5f935e3e3a058eb2c2889a5ade77af7652ec0d630e79c3523ec77
 
 name:           composite-base
 version:        0.7.5.0
@@ -62,7 +60,7 @@ library
     , 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
@@ -115,7 +113,7 @@ test-suite composite-base-test
     , 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

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

composite-binary/composite-binary.cabal

@@ -3,8 +3,6 @@ cabal-version: 1.12
 -- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 6d61bdab3e4f1c7baa35523fecd2c9c51ac17b1d21f32123b952f565c3f7ef1e
 
 name:           composite-binary
 version:        0.7.5.0

composite-ekg/composite-ekg.cabal

@@ -3,8 +3,6 @@ cabal-version: 1.12
 -- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: ab9762a2abe9305fbd5f9f370b887a59e74bccfe0c4dc2f208e73c4927af80ce
 
 name:           composite-ekg
 version:        0.7.5.0

composite-hashable/composite-hashable.cabal

@@ -3,8 +3,6 @@ cabal-version: 1.12
 -- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 6c11b4fa32a59de7edab16d55829931dd6e4646df412fe5cb8d0875e60721fe0
 
 name:           composite-hashable
 version:        0.7.5.0

composite-opaleye/composite-opaleye.cabal

@@ -3,8 +3,6 @@ cabal-version: 1.12
 -- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: d45206876f1c6df5aaa70fc4a46244a2d0e63830053e1d71fe3a5b808672c088
 
 name:           composite-opaleye
 version:        0.7.5.0

composite-swagger/composite-swagger.cabal

@@ -3,8 +3,6 @@ cabal-version: 1.12
 -- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: a38d69dbf4166ffb8697cc7b39a2a48d5cac42d3b6c0a49d422bbc1838989247
 
 name:           composite-swagger
 version:        0.7.5.0

stack-8.10.2.yaml → stack-8.10.4.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2020-10-09
+resolver: lts-18.2
 packages:
   - composite-aeson
   - composite-aeson-path

stack.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2021-04-06
+resolver: nightly-2021-08-08
 packages:
   - composite-aeson
   - composite-aeson-path
@@ -12,11 +12,20 @@ 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
+- swagger2-2.6
+- these-skinny-0.7.4
+- refined-0.6.2
 allow-newer: true
 nix:
   packages:
     - lzma
     - postgresql
     - zlib
+  pure: false

stack.yaml.lock

@@ -5,22 +5,78 @@
 
 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
+- 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
+- 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
+- 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
 - completed:
     hackage: opaleye-0.6.7006.1@sha256:06c8d8808aedabb065ce26387285b5f2d3320b801f818899cced186dc645dc34,5725
     pantry-tree:
       size: 5535
       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
+- 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
+- completed:
+    hackage: swagger2-2.6@sha256:12c0752b397da71e286a2f8998dfd842376df56f624deb0ad8d858c6e20cb8bd,4578
+    pantry-tree:
+      size: 2260
+      sha256: d337f87ba09804d3e3c89317cfbef5ef0c100c4bb0e3b5b61cbb8ca6703a76d5
+  original:
+    hackage: swagger2-2.6
+- completed:
+    hackage: these-skinny-0.7.4@sha256:e29336a1a70a497e09d8266f8438efb30a807bafaa6b00f5a136f7493efb3160,1239
+    pantry-tree:
+      size: 262
+      sha256: 77f01554e40d8e910d00f95c35dde86df4f691e2955d9afdc16508114c4d1af2
+  original:
+    hackage: these-skinny-0.7.4
+- completed:
+    hackage: refined-0.6.2@sha256:79ff6e5eeb185706711ec0690daae0c7a1bada1d692853af4679be5933afff6c,2748
+    pantry-tree:
+      size: 562
+      sha256: 97e6f14269f0e180b86f3a004f1dd97d0ba060f6f91390cb367028ea95d7292c
+  original:
+    hackage: refined-0.6.2
 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: 571803
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2021/8/8.yaml
+    sha256: 8492e8c97cab9a573cc1a559c688201fd29db575bada55d867717188791c7133
+  original: nightly-2021-08-08