Skip to content
This repository was archived by the owner on May 25, 2022. It is now read-only.

Commit e6afc04

Browse files
locallycompactlocallycompact
committed
Update to stack nightly-2021-08-08
1 parent bb538f0 commit e6afc04

File tree

18 files changed

+103
-44
lines changed

18 files changed

+103
-44
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ cabal-version: 1.12
33
-- This file has been generated from package.yaml by hpack version 0.34.4.
44
--
55
-- see: https://github.com/sol/hpack
6-
--
7-
-- hash: a4066140c496fecb26e6cfeeff88c4087efdba2a3c2bdb079826114af9895eb9
86

97
name: composite-aeson-path
108
version: 0.7.5.0
@@ -50,5 +48,5 @@ library
5048
build-depends:
5149
base >=4.12 && <5
5250
, composite-aeson ==0.7.*
53-
, path >=0.6 && <0.9
51+
, path >=0.6 && <0.10
5452
default-language: Haskell2010

‎composite-aeson-path/package.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ category: Records
1111

1212
dependencies:
1313
- base >= 4.12 && < 5
14-
- path >= 0.6 && < 0.9
14+
- path >= 0.6 && < 0.10
1515
- composite-aeson >= 0.7 && < 0.8
1616

1717
default-extensions:

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ cabal-version: 1.12
33
-- This file has been generated from package.yaml by hpack version 0.34.4.
44
--
55
-- see: https://github.com/sol/hpack
6-
--
7-
-- hash: 4e1131b3777a8c511a2d35d07dd82508bb402d0db1a7cda4b2d25f4829fad8cc
86

97
name: composite-aeson-refined
108
version: 0.7.5.0
@@ -49,7 +47,7 @@ library
4947
ghc-options: -Wall -O2
5048
build-depends:
5149
aeson-better-errors >=0.9.1.0 && <0.10
52-
, base >=4.12 && <5
50+
, base >=4.12 && <4.16
5351
, composite-aeson ==0.7.*
5452
, mtl >=2.2.1 && <2.3
5553
, refined >=0.1.2.1 && <0.7

‎composite-aeson-refined/package.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ copyright: 2017 Confer Health, Inc., 2020-2021 Vital Biosciences
1010
category: Records
1111

1212
dependencies:
13-
- base >= 4.12 && < 5
13+
- base >= 4.12 && < 4.16
1414
- aeson-better-errors >= 0.9.1.0 && < 0.10
1515
- composite-aeson >= 0.7 && < 0.8
1616
- mtl >= 2.2.1 && < 2.3

‎composite-aeson/composite-aeson.cabal‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ cabal-version: 1.12
33
-- This file has been generated from package.yaml by hpack version 0.34.4.
44
--
55
-- see: https://github.com/sol/hpack
6-
--
7-
-- hash: c527166c37e70d59b1575a743e5716d678130dc8efeac1783f5e533f73c6f6a2
86

97
name: composite-aeson
108
version: 0.7.5.0
@@ -66,15 +64,15 @@ library
6664
, composite-base ==0.7.*
6765
, containers >=0.5.7.0 && <0.7
6866
, contravariant >=1.4 && <1.6
69-
, generic-deriving >=1.11.2 && <1.14
67+
, generic-deriving >=1.11.2 && <1.15
7068
, hashable >=1.2.6.1 && <1.4
7169
, lens >=4.15.4 && <5.1
7270
, mmorph >=1.0.9 && <1.2
7371
, mtl >=2.2.1 && <2.3
7472
, profunctors >=5.2.1 && <5.7
7573
, scientific >=0.3.5.1 && <0.4
7674
, tagged >=0.8.5 && <0.9
77-
, template-haskell >=2.11.1.0 && <2.17
75+
, template-haskell >=2.11.1.0 && <2.18
7876
, text >=1.2.2.2 && <1.3
7977
, time >=1.6.0.1 && <1.10
8078
, unordered-containers >=0.2.8.0 && <0.3
@@ -128,7 +126,7 @@ test-suite composite-aeson-test
128126
, composite-base ==0.7.*
129127
, containers >=0.5.7.0 && <0.7
130128
, contravariant >=1.4 && <1.6
131-
, generic-deriving >=1.11.2 && <1.14
129+
, generic-deriving >=1.11.2 && <1.15
132130
, hashable >=1.2.6.1 && <1.4
133131
, hspec
134132
, lens >=4.15.4 && <5.1
@@ -137,7 +135,7 @@ test-suite composite-aeson-test
137135
, profunctors >=5.2.1 && <5.7
138136
, scientific >=0.3.5.1 && <0.4
139137
, tagged >=0.8.5 && <0.9
140-
, template-haskell >=2.11.1.0 && <2.17
138+
, template-haskell >=2.11.1.0 && <2.18
141139
, text >=1.2.2.2 && <1.3
142140
, time >=1.6.0.1 && <1.10
143141
, unordered-containers >=0.2.8.0 && <0.3

‎composite-aeson/package.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ dependencies:
1616
- composite-base >= 0.7 && < 0.8
1717
- containers >= 0.5.7.0 && < 0.7
1818
- contravariant >= 1.4 && < 1.6
19-
- generic-deriving >= 1.11.2 && < 1.14
19+
- generic-deriving >= 1.11.2 && < 1.15
2020
- hashable >= 1.2.6.1 && < 1.4
2121
- lens >= 4.15.4 && < 5.1
2222
- mmorph >= 1.0.9 && < 1.2
2323
- mtl >= 2.2.1 && < 2.3
2424
- profunctors >= 5.2.1 && < 5.7
2525
- scientific >= 0.3.5.1 && < 0.4
2626
- tagged >= 0.8.5 && < 0.9
27-
- template-haskell >= 2.11.1.0 && < 2.17
27+
- template-haskell >= 2.11.1.0 && < 2.18
2828
- text >= 1.2.2.2 && < 1.3
2929
- time >= 1.6.0.1 && < 1.10
3030
- unordered-containers >= 0.2.8.0 && < 0.3

‎composite-aeson/src/Composite/Aeson/Formats/Generic.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ instance Lift SumStyle where
153153
SumStyleFieldName -> [| SumStyleFieldName |]
154154
SumStyleTypeValue a b -> [| SumStyleTypeValue $(liftString $ unpack a) $(liftString $ unpack b) |]
155155
SumStyleMergeType a -> [| SumStyleMergeType $(liftString $ unpack a) |]
156-
#if MIN_VERSION_template_haskell(2,16,0)
157-
liftTyped = fmap TExp . lift
156+
#if MIN_VERSION_template_haskell(2,17,0)
157+
#elif MIN_VERSION_template_haskell(2,16,0)
158158
#endif
159159

160160

‎composite-aeson/src/Composite/Aeson/Formats/InternalTH.hs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
module Composite.Aeson.Formats.InternalTH
23
( makeTupleDefaults, makeTupleFormats, makeNamedTupleFormats
34
) where
@@ -20,6 +21,9 @@ import Language.Haskell.TH
2021
, bindS, noBindS
2122
, Type(AppT, ArrowT, ConT, ForallT, TupleT, VarT), appT, conT, varT
2223
, TyVarBndr(PlainTV)
24+
#if MIN_VERSION_template_haskell(2,17,0)
25+
, Specificity(SpecifiedSpec)
26+
#endif
2327
)
2428
import Language.Haskell.TH.Syntax (lift)
2529

@@ -64,7 +68,11 @@ makeTupleFormats = concat <$> traverse makeTupleFormat [2..59]
6468
tupleType = foldl' AppT (TupleT arity) (map VarT tyNames)
6569
funType =
6670
ForallT
71+
#if MIN_VERSION_template_haskell(2,17,0)
72+
(PlainTV tyErrName SpecifiedSpec : map (flip PlainTV SpecifiedSpec) tyNames)
73+
#else
6774
(PlainTV tyErrName : map PlainTV tyNames)
75+
#endif
6876
[]
6977
(foldr (\ tyName rest -> ArrowT `AppT` (ConT ''JsonFormat `AppT` VarT tyErrName `AppT` tyName) `AppT` rest)
7078
(ConT ''JsonFormat `AppT` VarT tyErrName `AppT` tupleType)
@@ -116,7 +124,11 @@ makeNamedTupleFormats = concat <$> traverse makeNamedTupleFormat [2..59]
116124
tupleType = foldl' AppT (TupleT arity) (map VarT tyNames)
117125
funType =
118126
ForallT
127+
#if MIN_VERSION_template_haskell(2,17,0)
128+
(PlainTV tyErrName SpecifiedSpec : map (flip PlainTV SpecifiedSpec) tyNames)
129+
#else
119130
(PlainTV tyErrName : map PlainTV tyNames)
131+
#endif
120132
[]
121133
(foldr (\ tyName rest -> ArrowT `AppT` ConT ''Text `AppT` (ArrowT `AppT` (ConT ''JsonFormat `AppT` VarT tyErrName `AppT` tyName) `AppT` rest))
122134
(ConT ''JsonFormat `AppT` VarT tyErrName `AppT` tupleType)

‎composite-base/composite-base.cabal‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ cabal-version: 1.12
33
-- This file has been generated from package.yaml by hpack version 0.34.4.
44
--
55
-- see: https://github.com/sol/hpack
6-
--
7-
-- hash: f5caba9cc5d5f935e3e3a058eb2c2889a5ade77af7652ec0d630e79c3523ec77
86

97
name: composite-base
108
version: 0.7.5.0
@@ -62,7 +60,7 @@ library
6260
, monad-control >=1.0.2.2 && <1.1
6361
, mtl >=2.2.1 && <2.3
6462
, profunctors >=5.2.1 && <5.7
65-
, template-haskell >=2.11.1.0 && <2.17
63+
, template-haskell >=2.11.1.0 && <2.18
6664
, text >=1.2.2.2 && <1.3
6765
, transformers >=0.5.2.0 && <0.6
6866
, transformers-base >=0.4.4 && <0.5
@@ -115,7 +113,7 @@ test-suite composite-base-test
115113
, monad-control >=1.0.2.2 && <1.1
116114
, mtl >=2.2.1 && <2.3
117115
, profunctors >=5.2.1 && <5.7
118-
, template-haskell >=2.11.1.0 && <2.17
116+
, template-haskell >=2.11.1.0 && <2.18
119117
, text >=1.2.2.2 && <1.3
120118
, transformers >=0.5.2.0 && <0.6
121119
, transformers-base >=0.4.4 && <0.5

‎composite-base/package.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
- monad-control >= 1.0.2.2 && < 1.1
1818
- mtl >= 2.2.1 && < 2.3
1919
- profunctors >= 5.2.1 && < 5.7
20-
- template-haskell >= 2.11.1.0 && < 2.17
20+
- template-haskell >= 2.11.1.0 && < 2.18
2121
- text >= 1.2.2.2 && < 1.3
2222
- transformers >= 0.5.2.0 && < 0.6
2323
- transformers-base >= 0.4.4 && < 0.5

0 commit comments

Comments
 (0)