Update to stack nightly-2021-07-14

ConferOpenSource · Aug 2, 2021 · b3e3a69 · b3e3a69
1 parent 312040b
commit b3e3a69
Show file tree

Hide file tree

Showing 16 changed files with 387 additions and 60 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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