From e105c97a8d04f913889417321a97e1571508277e Mon Sep 17 00:00:00 2001 From: Will Sewell Date: Fri, 10 Feb 2017 13:33:18 +0000 Subject: [PATCH 1/2] Update to stackage lts-7.19 --- opaleye-sqlite/opaleye-sqlite.cabal | 12 ++++++------ .../src/Opaleye/SQLite/Internal/PackMap.hs | 2 +- opaleye.cabal | 4 ++-- stack.yaml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/opaleye-sqlite/opaleye-sqlite.cabal b/opaleye-sqlite/opaleye-sqlite.cabal index b098906de..3929f2a04 100644 --- a/opaleye-sqlite/opaleye-sqlite.cabal +++ b/opaleye-sqlite/opaleye-sqlite.cabal @@ -28,16 +28,16 @@ library , base16-bytestring >= 0.1.1.6 && < 0.2 , case-insensitive >= 1.2 && < 1.3 , bytestring >= 0.10 && < 0.11 - , contravariant >= 1.2 && < 1.4 + , contravariant >= 1.2 && < 1.5 , direct-sqlite >= 2.3.13 && < 2.4 , pretty >= 1.1.1.0 && < 1.2 - , product-profunctors >= 0.6.2 && < 0.7 - , profunctors >= 4.0 && < 5.2 - , semigroups >= 0.13 && < 0.17 + , product-profunctors >= 0.6.2 && < 0.8 + , profunctors >= 4.0 && < 5.3 + , semigroups >= 0.13 && < 0.19 , sqlite-simple , text >= 0.11 && < 1.3 - , transformers >= 0.3 && < 0.5 - , time >= 1.4 && < 1.6 + , transformers >= 0.3 && < 0.6 + , time >= 1.4 && < 1.7 , time-locale-compat >= 0.1 && < 0.2 , uuid >= 1.3 && < 1.4 , void >= 0.4 && < 0.8 diff --git a/opaleye-sqlite/src/Opaleye/SQLite/Internal/PackMap.hs b/opaleye-sqlite/src/Opaleye/SQLite/Internal/PackMap.hs index 3873d4628..d2a13fcef 100644 --- a/opaleye-sqlite/src/Opaleye/SQLite/Internal/PackMap.hs +++ b/opaleye-sqlite/src/Opaleye/SQLite/Internal/PackMap.hs @@ -40,7 +40,7 @@ import qualified Data.Functor.Identity as I -- 'ProductProfunctor') in @s@ and @t@. It is unclear at this point -- whether we want the same @Traversal@ laws to hold or not. Our use -- cases may be much more general. -data PackMap a b s t = PackMap (Applicative f => +data PackMap a b s t = PackMap (forall f. Applicative f => (a -> f b) -> s -> f t) -- | Replaces the targeted occurences of @a@ in @s@ with @b@ (changing diff --git a/opaleye.cabal b/opaleye.cabal index 89b0a63ce..07ec971eb 100644 --- a/opaleye.cabal +++ b/opaleye.cabal @@ -28,7 +28,7 @@ library build-depends: -- attoparsec can be removed once postgresql-simple patch in -- Internal.RunQuery is merged upstream - aeson >= 0.6 && < 1.1 + aeson >= 0.6 && < 1.2 , attoparsec >= 0.10.3 && < 0.14 , base >= 4.6 && < 5 , base16-bytestring >= 0.1.1.6 && < 0.2 @@ -100,7 +100,7 @@ test-suite test other-modules: QuickCheck hs-source-dirs: Test build-depends: - aeson >= 0.6 && < 1.1, + aeson >= 0.6 && < 1.2, base >= 4 && < 5, containers, contravariant, diff --git a/stack.yaml b/stack.yaml index 802cc6e11..3d30803f9 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-3.16 +resolver: lts-7.19 packages: - '.' - opaleye-sqlite/ From 0d0165f3475440f2a9e8e65828034a3d2270a1de Mon Sep 17 00:00:00 2001 From: Will Sewell Date: Fri, 10 Feb 2017 13:33:41 +0000 Subject: [PATCH 2/2] Use aeson-1.1.0.0 --- stack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/stack.yaml b/stack.yaml index 3d30803f9..743080559 100644 --- a/stack.yaml +++ b/stack.yaml @@ -4,3 +4,4 @@ packages: - opaleye-sqlite/ extra-deps: - postgresql-simple-0.5.1.1 +- aeson-1.1.0.0