Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade stackage 2018-11-30 and other lts #34

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: bookkeeper
version: 0.2.5
version: 0.2.6
synopsis: Anonymous records and overloaded labels
description: Please see README.md for more information and examples.
homepage: http://github.com/turingjump/bookkeeper#readme
Expand All @@ -19,7 +19,7 @@ extra-source-files:
ghc-options: -Wall

dependencies:
- base >= 4.9 && < 4.11
- base >= 4.9 && < 4.13
- type-level-sets
- data-default-class

Expand Down Expand Up @@ -89,6 +89,6 @@ executables:
default-extensions: []
other-modules: []
dependencies:
- base >=4.9 && < 4.11
- base >=4.9 && < 4.13
- bookkeeper
- markdown-unlit
5 changes: 4 additions & 1 deletion src/Bookkeeper/Internal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ instance Eq (Book' '[]) where
instance (Eq val, Eq (Book' xs)) => Eq (Book' ((field :=> val) ': xs) ) where
Book (Map.Ext _ a as) == Book (Map.Ext _ b bs) = a == b && Book as == Book bs

#if MIN_VERSION_base(4,11,0)
instance Semigroup (Book' '[]) where (<>) = mappend
#endif
instance Monoid (Book' '[]) where
mempty = emptyBook
_ `mappend` _ = emptyBook
Expand Down Expand Up @@ -236,7 +239,7 @@ instance
fromGeneric (l :*: r)
= Book $ Map.union (getBook (fromGeneric l)) (getBook (fromGeneric r))

type family Expected a where
type family Expected (a :: k -> Type) :: k where
Expected (l :+: r) = TypeError ('Text "Cannot convert sum types into Books")
Expected U1 = TypeError ('Text "Cannot convert non-record types into Books")

Expand Down
5 changes: 4 additions & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
resolver: nightly-2017-08-24
#resolver: lts-9.21 does not work with this lts
#resolver: lts-12.20
#resolver: lts-11.22
resolver: nightly-2018-11-29
packages:
- '.'
extra-deps:
Expand Down