Commit bd12f78a authored by Ross MacLeod's avatar Ross MacLeod
Browse files

make backwards compatible with lts-9.13, bump version, add dependency version bounds

parent c461f6d9
......@@ -2,10 +2,10 @@
--
-- see: https://github.com/sol/hpack
--
-- hash: 6d7664bc05d04bfac0cf8139e9b373d44dbbcb8878e6b584275e255d14c86556
-- hash: 170cc0e585bd302406efd7480633161799ed9c5027f62f50cfeea723b73865f6
name: composite-aeson-refined
version: 0.5.3.0
version: 0.5.4.0
synopsis: composite-aeson support for Refined from the refined package
description: JsonFormat and DefaultJsonFormat for Refined
category: Records
......@@ -23,11 +23,11 @@ library
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
aeson-better-errors >=0.9.1.0 && <0.10
, base >=4.7 && <5
, composite-aeson
, mtl
, refined
, composite-aeson >=0.5.3.0 && <0.6
, mtl >=2.2.1 && <2.3
, refined >=0.1.2.1 && <0.2
exposed-modules:
Composite.Aeson.Refined
other-modules:
......
......@@ -3,7 +3,7 @@
}:
mkDerivation {
pname = "composite-aeson-refined";
version = "0.5.3.0";
version = "0.5.4.0";
src = ./.;
libraryHaskellDepends = [
aeson-better-errors base composite-aeson mtl refined
......
name: composite-aeson-refined
version: 0.5.3.0
version: 0.5.4.0
synopsis: composite-aeson support for Refined from the refined package
description: JsonFormat and DefaultJsonFormat for Refined
homepage: https://github.com/ConferHealth/composite#readme
......@@ -10,11 +10,11 @@ copyright: 2017 Confer Health, Inc.
category: Records
dependencies:
- aeson-better-errors
- base >= 4.7 && < 5
- composite-aeson
- mtl
- refined
- aeson-better-errors >= 0.9.1.0 && < 0.10
- composite-aeson >= 0.5.3.0 && < 0.6
- mtl >= 2.2.1 && < 2.3
- refined >= 0.1.2.1 && < 0.2
default-extensions:
- DataKinds
......
......@@ -2,10 +2,10 @@
--
-- see: https://github.com/sol/hpack
--
-- hash: 4e9ab94cf169eaf448cbf6804494461dd88a0a774c205c7422c2b97393c5525b
-- hash: e5cf48f0def6a0629ab84aeef3ea62b238fbc13d5a79a01f1bd4ebbdccf3df5f
name: composite-aeson
version: 0.5.3.0
version: 0.5.4.0
synopsis: JSON for Vinyl/Frames records
description: Integration between Aeson and Vinyl/Frames records allowing records to be easily converted to JSON using automatic derivation, explicit formats, or a mix of both.
category: Records
......@@ -23,26 +23,26 @@ library
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
, aeson-better-errors
aeson >=1.1.2.0 && <1.3
, aeson-better-errors >=0.9.1.0 && <0.10
, base >=4.7 && <5
, composite-base
, containers
, contravariant
, generic-deriving
, hashable
, lens
, mmorph
, mtl
, profunctors
, scientific
, tagged
, template-haskell
, text
, time
, unordered-containers
, vector
, vinyl
, composite-base >=0.5.3.0 && <0.6
, containers >=0.5.7.0 && <0.6
, contravariant >=1.4 && <1.5
, generic-deriving >=1.11.2 && <1.13
, hashable >=1.2.6.1 && <1.3
, lens >=4.15.4 && <4.17
, mmorph >=1.0.9 && <1.2
, mtl >=2.2.1 && <2.3
, profunctors >=5.2.1 && <5.3
, scientific >=0.3.5.1 && <0.4
, tagged >=0.8.5 && <0.9
, template-haskell >=2.11.1.0 && <2.13
, text >=1.2.2.2 && <1.3
, time >=1.6.0.1 && <1.9
, unordered-containers >=0.2.8.0 && <0.3
, vector >=0.12.0.1 && <0.13
, vinyl >=0.5.3 && <0.8
exposed-modules:
Composite.Aeson
Composite.Aeson.Base
......@@ -69,29 +69,29 @@ test-suite composite-aeson-test
ghc-options: -Wall -O2 -threaded -rtsopts -with-rtsopts=-N -fno-warn-orphans
build-depends:
QuickCheck
, aeson
, aeson-better-errors
, aeson >=1.1.2.0 && <1.3
, aeson-better-errors >=0.9.1.0 && <0.10
, aeson-qq
, base >=4.7 && <5
, composite-aeson
, composite-base
, containers
, contravariant
, generic-deriving
, hashable
, composite-base >=0.5.3.0 && <0.6
, containers >=0.5.7.0 && <0.6
, contravariant >=1.4 && <1.5
, generic-deriving >=1.11.2 && <1.13
, hashable >=1.2.6.1 && <1.3
, hspec
, lens
, mmorph
, mtl
, profunctors
, scientific
, tagged
, template-haskell
, text
, time
, unordered-containers
, vector
, vinyl
, lens >=4.15.4 && <4.17
, mmorph >=1.0.9 && <1.2
, mtl >=2.2.1 && <2.3
, profunctors >=5.2.1 && <5.3
, scientific >=0.3.5.1 && <0.4
, tagged >=0.8.5 && <0.9
, template-haskell >=2.11.1.0 && <2.13
, text >=1.2.2.2 && <1.3
, time >=1.6.0.1 && <1.9
, unordered-containers >=0.2.8.0 && <0.3
, vector >=0.12.0.1 && <0.13
, vinyl >=0.5.3 && <0.8
other-modules:
DateTimeSpec
EnumSpec
......
......@@ -6,7 +6,7 @@
}:
mkDerivation {
pname = "composite-aeson";
version = "0.5.3.0";
version = "0.5.4.0";
src = ./.;
libraryHaskellDepends = [
aeson aeson-better-errors base composite-base containers
......
name: composite-aeson
version: 0.5.3.0
version: 0.5.4.0
synopsis: JSON for Vinyl/Frames records
description: Integration between Aeson and Vinyl/Frames records allowing records to be easily converted to JSON using automatic derivation, explicit formats, or a mix of both.
homepage: https://github.com/ConferHealth/composite#readme
......@@ -11,26 +11,25 @@ category: Records
dependencies:
- base >= 4.7 && < 5
- mtl
- aeson
- aeson-better-errors
- composite-base
- containers
- contravariant
- generic-deriving
- hashable
- lens
- mmorph
- mtl
- profunctors
- scientific
- tagged
- template-haskell
- text
- time
- unordered-containers
- vector
- vinyl
- aeson >= 1.1.2.0 && < 1.3
- aeson-better-errors >= 0.9.1.0 && < 0.10
- composite-base >= 0.5.3.0 && < 0.6
- containers >= 0.5.7.0 && < 0.6
- contravariant >= 1.4 && < 1.5
- generic-deriving >= 1.11.2 && < 1.13
- hashable >= 1.2.6.1 && < 1.3
- lens >= 4.15.4 && < 4.17
- mmorph >= 1.0.9 && < 1.2
- mtl >= 2.2.1 && < 2.3
- profunctors >= 5.2.1 && < 5.3
- scientific >= 0.3.5.1 && < 0.4
- tagged >= 0.8.5 && < 0.9
- template-haskell >= 2.11.1.0 && < 2.13
- text >= 1.2.2.2 && < 1.3
- time >= 1.6.0.1 && < 1.9
- unordered-containers >= 0.2.8.0 && < 0.3
- vector >= 0.12.0.1 && < 0.13
- vinyl >= 0.5.3 && < 0.8
default-extensions:
- DataKinds
......
{-# LANGUAGE CPP #-}
module Composite.Aeson.TH
( makeFieldJsonWrapper, makeFieldJsonWrapperExplicit
, makeRecordJsonWrapper, makeRecordJsonWrapperExplicit
......@@ -90,7 +91,11 @@ makeFieldJsonWrapperExplicit wrapperNameStr fieldsTyName sumStyle fieldFormatExp
[] -- TyVarBndrs
Nothing -- kind
(recC wrapperName [varBangType extractorName (bangType (bang noSourceUnpackedness noSourceStrictness) fieldTy)])
#if MIN_VERSION_template_haskell(2,12,0)
[] -- deriving context
#else
(cxt [])
#endif
, sigD
formatName
[t| forall e. JsonFormat e $(conT wrapperName) |]
......@@ -187,7 +192,11 @@ makeRecordJsonWrapperExplicit wrapperNameStr fieldsTyName recFormatExp = do
[] -- TyVarBndrs
Nothing -- kind
(recC wrapperName [varBangType extractorName (bangType (bang noSourceUnpackedness noSourceStrictness) recordTy)])
#if MIN_VERSION_template_haskell(2,12,0)
[] -- deriving context
#else
(cxt [])
#endif
, sigD
formatName
[t| forall e. JsonFormat e $(conT wrapperName) |]
......
......@@ -2,10 +2,10 @@
--
-- see: https://github.com/sol/hpack
--
-- hash: 2618bea197d35bcbfa54da654a7ac6b494be054ccf4a1c58b235c2464847b49b
-- hash: 0e7b65fc80c01f09bbc6c5d29da7e17ba09561542cffc9f1780105d9c863f54d
name: composite-base
version: 0.5.3.0
version: 0.5.4.0
synopsis: Shared utilities for composite-* packages.
description: Shared helpers for the various composite packages.
category: Records
......@@ -24,16 +24,16 @@ library
ghc-options: -Wall -O2
build-depends:
base >=4.7 && <5
, exceptions
, lens
, monad-control
, mtl
, profunctors
, template-haskell
, text
, transformers
, transformers-base
, vinyl
, exceptions >=0.8.3 && <0.9
, lens >=4.15.4 && <4.17
, monad-control >=1.0.2.2 && <1.1
, mtl >=2.2.1 && <2.3
, profunctors >=5.2.1 && <5.3
, template-haskell >=2.11.1.0 && <2.13
, text >=1.2.2.2 && <1.3
, transformers >=0.5.2.0 && <0.6
, transformers-base >=0.4.4 && <0.5
, vinyl >=0.5.3 && <0.8
exposed-modules:
Composite
Composite.CoRecord
......@@ -55,17 +55,17 @@ test-suite composite-base-test
QuickCheck
, base >=4.7 && <5
, composite-base
, exceptions
, exceptions >=0.8.3 && <0.9
, hspec
, lens
, monad-control
, mtl
, profunctors
, template-haskell
, text
, transformers
, transformers-base
, vinyl
, lens >=4.15.4 && <4.17
, monad-control >=1.0.2.2 && <1.1
, mtl >=2.2.1 && <2.3
, profunctors >=5.2.1 && <5.3
, template-haskell >=2.11.1.0 && <2.13
, text >=1.2.2.2 && <1.3
, transformers >=0.5.2.0 && <0.6
, transformers-base >=0.4.4 && <0.5
, vinyl >=0.5.3 && <0.8
other-modules:
RecordSpec
THSpec
......
......@@ -4,7 +4,7 @@
}:
mkDerivation {
pname = "composite-base";
version = "0.5.3.0";
version = "0.5.4.0";
src = ./.;
libraryHaskellDepends = [
base exceptions lens monad-control mtl profunctors template-haskell
......
name: composite-base
version: 0.5.3.0
version: 0.5.4.0
synopsis: Shared utilities for composite-* packages.
description: Shared helpers for the various composite packages.
homepage: https://github.com/ConferHealth/composite#readme
......@@ -11,16 +11,16 @@ category: Records
dependencies:
- base >= 4.7 && < 5
- exceptions
- lens
- monad-control
- mtl
- profunctors
- template-haskell
- text
- transformers
- transformers-base
- vinyl
- exceptions >= 0.8.3 && < 0.9
- lens >= 4.15.4 && < 4.17
- monad-control >= 1.0.2.2 && < 1.1
- mtl >= 2.2.1 && < 2.3
- profunctors >= 5.2.1 && < 5.3
- template-haskell >= 2.11.1.0 && < 2.13
- text >= 1.2.2.2 && < 1.3
- transformers >= 0.5.2.0 && < 0.6
- transformers-base >= 0.4.4 && < 0.5
- vinyl >= 0.5.3 && < 0.8
default-extensions:
- ConstraintKinds
......
......@@ -2,10 +2,10 @@
--
-- see: https://github.com/sol/hpack
--
-- hash: 3726ca578ca7926732d3ab015220c3602fc54ccdd157a2e781bee1a16dc4d101
-- hash: ede0627c100b634875900316ad1ba97ad65b35b38d4032df0c600181dfd18b10
name: composite-ekg
version: 0.5.3.0
version: 0.5.4.0
synopsis: EKG Metrics for Vinyl/Frames records
description: Integration between EKG and Vinyl/Frames records allowing records holding registered metrics to be easily constructed from a type declaration.
category: Records
......@@ -24,11 +24,11 @@ library
ghc-options: -Wall -O2
build-depends:
base >=4.7 && <5
, composite-base
, ekg-core
, lens
, text
, vinyl
, composite-base >=0.5.3.0 && <0.6
, ekg-core >=0.1.1.3 && <0.5
, lens >=4.15.4 && <4.17
, text >=1.2.2.2 && <1.3
, vinyl >=0.5.3 && <0.8
exposed-modules:
Composite.Ekg
other-modules:
......
{ mkDerivation, base, composite-base, ekg, ekg-core, lens, stdenv
, text, vinyl
{ mkDerivation, base, composite-base, ekg-core, lens, stdenv, text
, vinyl
}:
mkDerivation {
pname = "composite-ekg";
version = "0.5.3.0";
version = "0.5.4.0";
src = ./.;
libraryHaskellDepends = [
base composite-base ekg ekg-core lens text vinyl
base composite-base ekg-core lens text vinyl
];
homepage = "https://github.com/ConferHealth/composite#readme";
description = "EKG Metrics for Vinyl/Frames records";
......
name: composite-ekg
version: 0.5.3.0
version: 0.5.4.0
synopsis: EKG Metrics for Vinyl/Frames records
description: Integration between EKG and Vinyl/Frames records allowing records holding registered metrics to be easily constructed from a type declaration.
homepage: https://github.com/ConferHealth/composite#readme
......@@ -11,11 +11,11 @@ category: Records
dependencies:
- base >= 4.7 && < 5
- composite-base
- ekg-core
- lens
- text
- vinyl
- composite-base >= 0.5.3.0 && < 0.6
- ekg-core >= 0.1.1.3 && < 0.5
- lens >= 4.15.4 && < 4.17
- text >= 1.2.2.2 && < 1.3
- vinyl >= 0.5.3 && < 0.8
default-extensions:
- DataKinds
......
......@@ -2,10 +2,10 @@
--
-- see: https://github.com/sol/hpack
--
-- hash: a1c620c148c581c5ae4fe885f39c181f2a5ccea5e701717b1e162c6d884211bd
-- hash: 2d6f4b51d74138272d878e82f39a9ea1283df0b56f9264b5e60ce877d44f51f6
name: composite-opaleye
version: 0.5.3.0
version: 0.5.4.0
synopsis: Opaleye SQL for Frames records
description: Integration between Frames records and Opaleye SQL, allowing records to be stored, retrieved, and queried from PostgreSQL.
category: Records
......@@ -24,16 +24,16 @@ library
ghc-options: -Wall -O2
build-depends:
base >=4.7 && <5
, bytestring
, composite-base
, lens
, opaleye
, postgresql-simple
, product-profunctors
, profunctors
, template-haskell
, text
, vinyl
, bytestring >=0.10.8.1 && <0.11
, composite-base >=0.5.3.0 && <0.6
, lens >=4.15.4 && <4.17
, opaleye >=0.5.4.0 && <0.7
, postgresql-simple >=0.5.3.0 && <0.6
, product-profunctors >=0.8.0.3 && <0.10
, profunctors >=5.2.1 && <5.3
, template-haskell >=2.11.1.0 && <2.13
, text >=1.2.2.2 && <1.3
, vinyl >=0.5.3 && <0.8
exposed-modules:
Composite.Opaleye
Composite.Opaleye.ProductProfunctors
......@@ -55,18 +55,18 @@ test-suite composite-opaleye-test
build-depends:
QuickCheck
, base >=4.7 && <5
, bytestring
, composite-base
, bytestring >=0.10.8.1 && <0.11
, composite-base >=0.5.3.0 && <0.6
, composite-opaleye
, hspec
, lens
, opaleye
, postgresql-simple
, product-profunctors
, profunctors
, template-haskell
, text
, vinyl
, lens >=4.15.4 && <4.17
, opaleye >=0.5.4.0 && <0.7
, postgresql-simple >=0.5.3.0 && <0.6
, product-profunctors >=0.8.0.3 && <0.10
, profunctors >=5.2.1 && <5.3
, template-haskell >=2.11.1.0 && <2.13
, text >=1.2.2.2 && <1.3
, vinyl >=0.5.3 && <0.8
other-modules:
UpdateSpec
Paths_composite_opaleye
......
......@@ -4,7 +4,7 @@
}:
mkDerivation {
pname = "composite-opaleye";
version = "0.5.3.0";
version = "0.5.4.0";
src = ./.;
libraryHaskellDepends = [
base bytestring composite-base lens opaleye postgresql-simple
......
name: composite-opaleye
version: 0.5.3.0
version: 0.5.4.0
synopsis: Opaleye SQL for Frames records
description: Integration between Frames records and Opaleye SQL, allowing records to be stored, retrieved, and queried from PostgreSQL.
homepage: https://github.com/ConferHealth/composite#readme
......@@ -11,16 +11,16 @@ category: Records
dependencies:
- base >= 4.7 && < 5
- bytestring
- composite-base
- lens
- opaleye
- postgresql-simple
- product-profunctors
- profunctors
- template-haskell
- text
- vinyl
- bytestring >= 0.10.8.1 && < 0.11
- composite-base >= 0.5.3.0 && < 0.6
- lens >= 4.15.4 && < 4.17
- opaleye >= 0.5.4.0 && < 0.7
- postgresql-simple >= 0.5.3.0 && < 0.6
- product-profunctors >= 0.8.0.3 && < 0.10
- profunctors >= 5.2.1 && < 5.3
- template-haskell >= 2.11.1.0 && < 2.13
- text >= 1.2.2.2 && < 1.3
- vinyl >= 0.5.3 && < 0.8
default-extensions:
- DataKinds
......
{-# LANGUAGE CPP #-}
module Composite.Opaleye.TH where
import Composite.Opaleye.Util (constantColumnUsing)
......@@ -98,7 +99,18 @@ deriveOpaleyeEnum hsName sqlName hsConToSqlValue = do
let conPairs = nullaryCons <&> \ conName ->
(conName, fromMaybe (nameBase conName) (hsConToSqlValue (nameBase conName)))
sqlTypeDecl <- dataD (cxt []) sqlTypeName [] Nothing [] []
sqlTypeDecl <-
dataD
(cxt [])
sqlTypeName
[]
Nothing
[]
#if MIN_VERSION_template_haskell(2,12,0)
[]
#else
(cxt [])
#endif
fromFieldInst <- instanceD (cxt []) [t| FromField $hsType |] . (:[]) $ do
field <- newName "field"
......
-- This file has been generated from package.yaml by hpack version 0.19.3.
-- This file has been generated from package.yaml by hpack version 0.18.1.
--
-- see: https://github.com/sol/hpack
name: composite-reflex
version: 0.5.3.0
version: 0.5.4.0
synopsis: Utilities for using composite records and corecords with Reflex
description: Utilities for using composite records and corecords with Reflex
category: Records
......@@ -21,17 +21,17 @@ library
default-extensions: DataKinds FlexibleContexts FlexibleInstances GADTs GeneralizedNewtypeDeriving LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns OverloadedStrings PatternSynonyms PolyKinds QuasiQuotes RankNTypes RecordWildCards RecursiveDo ScopedTypeVariables StandaloneDeriving StrictData TemplateHaskell TupleSections TypeApplications TypeFamilies TypeOperators ViewPatterns
ghc-options: -Wall -O2
build-depends:
base >=4.7 && <5
, composite-base
, data-default
, dependent-map
, dependent-sum
, http-api-data
, lens
base >= 4.7 && < 5
, composite-base >= 0.5.3.0 && < 0.6
, data-default >= 0.7.1.1 && < 0.8
, dependent-map >= 0.2.4.0 && < 0.3
, dependent-sum >= 0.4 && < 0.5
, http-api-data >= 0.3.7.1 && < 0.4
, lens >= 4.15.4 && < 4.17
, reflex
, reflex-dom
, text
, vinyl
, text >= 1.2.2.2 && < 1.3
, vinyl >= 0.5.3 && < 0.8
exposed-modules:
Composite.DMap
Composite.Reflex
......
......@@ -4,7 +4,7 @@
}:
mkDerivation {
pname = "composite-reflex";
version = "0.5.3.0";
version = "0.5.4.0";
src = ./.;
libraryHaskellDepends = [
base composite-base data-default dependent-map dependent-sum
......
name: composite-reflex
version: 0.5.3.0
version: 0.5.4.0
synopsis: Utilities for using composite records and corecords with Reflex
description: Utilities for using composite records and corecords with Reflex
homepage: https://github.com/ConferHealth/composite#readme
......@@ -11,16 +11,16 @@ category: Records
dependencies:
- base >= 4.7 && < 5
- composite-base
- data-default
- dependent-map
- dependent-sum
- http-api-data
- lens
- composite-base >= 0.5.3.0 && < 0.6
- data-default >= 0.7.1.1 && < 0.8
- dependent-map >= 0.2.4.0 && < 0.3
- dependent-sum >= 0.4 && < 0.5
- http-api-data >= 0.3.7.1 && < 0.4
- lens >= 4.15.4 && < 4.17
- reflex
- reflex-dom
- text
- vinyl
- text >= 1.2.2.2 && < 1.3
- vinyl >= 0.5.3 && < 0.8
default-extensions:
- DataKinds
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment