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

Commit b3e3a69

Browse files
locallycompactlocallycompact
committed
Update to stack nightly-2021-07-14
1 parent 312040b commit b3e3a69

File tree

16 files changed

+387
-60
lines changed

16 files changed

+387
-60
lines changed

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

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cabal-version: 1.12
22

3-
-- This file has been generated from package.yaml by hpack version 0.34.3.
3+
-- This file has been generated from package.yaml by hpack version 0.34.4.
44
--
55
-- see: https://github.com/sol/hpack
66
--
7-
-- hash: 6cf5aa5a674723a2cb68f4070e600bc24a79d087b3b16eafb3268df4f4c3a0bf
7+
-- hash: 1d79da1d24d68ea288af1013a75fec7f9f5348da279f1d56596f9f900d27c003
88

99
name: composite-aeson-path
1010
version: 0.7.5.0
@@ -25,10 +25,30 @@ library
2525
Paths_composite_aeson_path
2626
hs-source-dirs:
2727
src
28-
default-extensions: DataKinds FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving LambdaCase MultiParamTypeClasses MultiWayIf OverloadedStrings PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeFamilies TypeOperators ViewPatterns
28+
default-extensions:
29+
DataKinds
30+
FlexibleContexts
31+
FlexibleInstances
32+
GeneralizedNewtypeDeriving
33+
LambdaCase
34+
MultiParamTypeClasses
35+
MultiWayIf
36+
OverloadedStrings
37+
PatternSynonyms
38+
PolyKinds
39+
QuasiQuotes
40+
RankNTypes
41+
ScopedTypeVariables
42+
StandaloneDeriving
43+
StrictData
44+
TemplateHaskell
45+
TupleSections
46+
TypeFamilies
47+
TypeOperators
48+
ViewPatterns
2949
ghc-options: -Wall -O2
3050
build-depends:
3151
base >=4.7 && <5
32-
, composite-aeson >=0.7 && <0.8
52+
, composite-aeson ==0.7.*
3353
, path >=0.6 && <0.9
3454
default-language: Haskell2010

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

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cabal-version: 1.12
22

3-
-- This file has been generated from package.yaml by hpack version 0.34.3.
3+
-- This file has been generated from package.yaml by hpack version 0.34.4.
44
--
55
-- see: https://github.com/sol/hpack
66
--
7-
-- hash: cc4c674145c73cbeecab0efb83fee3f018641398f412b114fdc3a3aa8b6405ad
7+
-- hash: b1d426d112add047aa4759ae85d1a9350d360257d4e400f88355568f517e17b7
88

99
name: composite-aeson-refined
1010
version: 0.7.5.0
@@ -25,12 +25,32 @@ library
2525
Paths_composite_aeson_refined
2626
hs-source-dirs:
2727
src
28-
default-extensions: DataKinds FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving LambdaCase MultiParamTypeClasses MultiWayIf OverloadedStrings PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeFamilies TypeOperators ViewPatterns
28+
default-extensions:
29+
DataKinds
30+
FlexibleContexts
31+
FlexibleInstances
32+
GeneralizedNewtypeDeriving
33+
LambdaCase
34+
MultiParamTypeClasses
35+
MultiWayIf
36+
OverloadedStrings
37+
PatternSynonyms
38+
PolyKinds
39+
QuasiQuotes
40+
RankNTypes
41+
ScopedTypeVariables
42+
StandaloneDeriving
43+
StrictData
44+
TemplateHaskell
45+
TupleSections
46+
TypeFamilies
47+
TypeOperators
48+
ViewPatterns
2949
ghc-options: -Wall -O2
3050
build-depends:
3151
aeson-better-errors >=0.9.1.0 && <0.10
3252
, base >=4.7 && <5
33-
, composite-aeson >=0.7 && <0.8
53+
, composite-aeson ==0.7.*
3454
, mtl >=2.2.1 && <2.3
3555
, refined >=0.1.2.1 && <0.7
3656
default-language: Haskell2010

‎composite-aeson/composite-aeson.cabal‎

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cabal-version: 1.12
22

3-
-- This file has been generated from package.yaml by hpack version 0.34.3.
3+
-- This file has been generated from package.yaml by hpack version 0.34.4.
44
--
55
-- see: https://github.com/sol/hpack
66
--
7-
-- hash: 5ed294fd597a5fe41cec4edea20e59e45dc7d5f01b64ad8f078ef75e5e748468
7+
-- hash: 9799d7d973d1391e13276302ab02649777bd38c083579b00223e57580505bc62
88

99
name: composite-aeson
1010
version: 0.7.5.0
@@ -36,13 +36,34 @@ library
3636
Paths_composite_aeson
3737
hs-source-dirs:
3838
src
39-
default-extensions: DataKinds FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving LambdaCase MultiParamTypeClasses MultiWayIf OverloadedStrings PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeApplications TypeFamilies TypeOperators ViewPatterns
39+
default-extensions:
40+
DataKinds
41+
FlexibleContexts
42+
FlexibleInstances
43+
GeneralizedNewtypeDeriving
44+
LambdaCase
45+
MultiParamTypeClasses
46+
MultiWayIf
47+
OverloadedStrings
48+
PatternSynonyms
49+
PolyKinds
50+
QuasiQuotes
51+
RankNTypes
52+
ScopedTypeVariables
53+
StandaloneDeriving
54+
StrictData
55+
TemplateHaskell
56+
TupleSections
57+
TypeApplications
58+
TypeFamilies
59+
TypeOperators
60+
ViewPatterns
4061
ghc-options: -Wall -O2
4162
build-depends:
4263
aeson >=1.1.2.0 && <1.6
4364
, aeson-better-errors >=0.9.1.0 && <0.10
4465
, base >=4.7 && <5
45-
, composite-base >=0.7 && <0.8
66+
, composite-base ==0.7.*
4667
, containers >=0.5.7.0 && <0.7
4768
, contravariant >=1.4 && <1.6
4869
, generic-deriving >=1.11.2 && <1.14
@@ -74,7 +95,28 @@ test-suite composite-aeson-test
7495
Paths_composite_aeson
7596
hs-source-dirs:
7697
test
77-
default-extensions: DataKinds FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving LambdaCase MultiParamTypeClasses MultiWayIf OverloadedStrings PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeApplications TypeFamilies TypeOperators ViewPatterns
98+
default-extensions:
99+
DataKinds
100+
FlexibleContexts
101+
FlexibleInstances
102+
GeneralizedNewtypeDeriving
103+
LambdaCase
104+
MultiParamTypeClasses
105+
MultiWayIf
106+
OverloadedStrings
107+
PatternSynonyms
108+
PolyKinds
109+
QuasiQuotes
110+
RankNTypes
111+
ScopedTypeVariables
112+
StandaloneDeriving
113+
StrictData
114+
TemplateHaskell
115+
TupleSections
116+
TypeApplications
117+
TypeFamilies
118+
TypeOperators
119+
ViewPatterns
78120
ghc-options: -Wall -O2 -threaded -rtsopts -with-rtsopts=-N -fno-warn-orphans
79121
build-depends:
80122
QuickCheck
@@ -83,7 +125,7 @@ test-suite composite-aeson-test
83125
, aeson-qq
84126
, base >=4.7 && <5
85127
, composite-aeson
86-
, composite-base >=0.7 && <0.8
128+
, composite-base ==0.7.*
87129
, containers >=0.5.7.0 && <0.7
88130
, contravariant >=1.4 && <1.6
89131
, generic-deriving >=1.11.2 && <1.14

‎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: 52 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cabal-version: 1.12
22

3-
-- This file has been generated from package.yaml by hpack version 0.34.3.
3+
-- This file has been generated from package.yaml by hpack version 0.34.4.
44
--
55
-- see: https://github.com/sol/hpack
66
--
7-
-- hash: afc6990732690309917603d2a17b1c010034e560db9f68dcb358fe45bf7f0cb0
7+
-- hash: 3760bb562aa001b62693b1a573a15835800242a6d9b176a2f2345a091fb7283a
88

99
name: composite-base
1010
version: 0.7.5.0
@@ -29,11 +29,34 @@ library
2929
Paths_composite_base
3030
hs-source-dirs:
3131
src
32-
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
32+
default-extensions:
33+
ConstraintKinds
34+
DataKinds
35+
FlexibleContexts
36+
FlexibleInstances
37+
FunctionalDependencies
38+
GADTs
39+
GeneralizedNewtypeDeriving
40+
MultiParamTypeClasses
41+
NamedFieldPuns
42+
OverloadedStrings
43+
PatternSynonyms
44+
PolyKinds
45+
RankNTypes
46+
RecordWildCards
47+
ScopedTypeVariables
48+
StandaloneDeriving
49+
StrictData
50+
TemplateHaskell
51+
TupleSections
52+
TypeApplications
53+
TypeFamilies
54+
TypeOperators
55+
ViewPatterns
3356
ghc-options: -Wall -O2
3457
build-depends:
3558
base >=4.7 && <5
36-
, deepseq >=1.4 && <1.5
59+
, deepseq ==1.4.*
3760
, exceptions >=0.8.3 && <0.11
3861
, lens >=4.15.4 && <5.1
3962
, monad-control >=1.0.2.2 && <1.1
@@ -56,13 +79,36 @@ test-suite composite-base-test
5679
Paths_composite_base
5780
hs-source-dirs:
5881
test
59-
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
82+
default-extensions:
83+
ConstraintKinds
84+
DataKinds
85+
FlexibleContexts
86+
FlexibleInstances
87+
FunctionalDependencies
88+
GADTs
89+
GeneralizedNewtypeDeriving
90+
MultiParamTypeClasses
91+
NamedFieldPuns
92+
OverloadedStrings
93+
PatternSynonyms
94+
PolyKinds
95+
RankNTypes
96+
RecordWildCards
97+
ScopedTypeVariables
98+
StandaloneDeriving
99+
StrictData
100+
TemplateHaskell
101+
TupleSections
102+
TypeApplications
103+
TypeFamilies
104+
TypeOperators
105+
ViewPatterns
60106
ghc-options: -Wall -O2 -threaded -rtsopts -with-rtsopts=-N -fno-warn-orphans
61107
build-depends:
62108
QuickCheck
63109
, base >=4.7 && <5
64110
, composite-base
65-
, deepseq >=1.4 && <1.5
111+
, deepseq ==1.4.*
66112
, exceptions >=0.8.3 && <0.11
67113
, hspec
68114
, lens >=4.15.4 && <5.1

‎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

‎composite-binary/composite-binary.cabal‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cabal-version: 1.12
22

3-
-- This file has been generated from package.yaml by hpack version 0.34.3.
3+
-- This file has been generated from package.yaml by hpack version 0.34.4.
44
--
55
-- see: https://github.com/sol/hpack
66
--
7-
-- hash: f638fa0382ddb7ad13e47f4009f160d3c4729b52b64d2ab24e505c7ddcd8b5ec
7+
-- hash: 9bc5c7d2f8bfc9b2ccee3bf0bfe1324a586eaf6ac077a66b18c2dc3435e0cebc
88

99
name: composite-binary
1010
version: 0.7.5.0
@@ -25,10 +25,30 @@ library
2525
Paths_composite_binary
2626
hs-source-dirs:
2727
src
28-
default-extensions: DataKinds FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving LambdaCase MultiParamTypeClasses MultiWayIf OverloadedStrings PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeFamilies TypeOperators ViewPatterns
28+
default-extensions:
29+
DataKinds
30+
FlexibleContexts
31+
FlexibleInstances
32+
GeneralizedNewtypeDeriving
33+
LambdaCase
34+
MultiParamTypeClasses
35+
MultiWayIf
36+
OverloadedStrings
37+
PatternSynonyms
38+
PolyKinds
39+
QuasiQuotes
40+
RankNTypes
41+
ScopedTypeVariables
42+
StandaloneDeriving
43+
StrictData
44+
TemplateHaskell
45+
TupleSections
46+
TypeFamilies
47+
TypeOperators
48+
ViewPatterns
2949
ghc-options: -Wall -O2
3050
build-depends:
3151
base >=4.7 && <5
32-
, binary >=0.8 && <0.9
33-
, composite-base >=0.7 && <0.8
52+
, binary ==0.8.*
53+
, composite-base ==0.7.*
3454
default-language: Haskell2010

0 commit comments

Comments
 (0)