git.iko.soy/patch
on develop help sign in
Merge pull request #30 from reflex-frp/proper-orphans-dep
668ab06John Ericson
ChangeLog.md+5
compare with develop
unifiedsplit
@@ -2,6 +2,11 @@
2
2
3## Unreleased
3## Unreleased
4
4
5+* New dep of `data-orphans` for old GHC to get instances honestly instead of
6+ via `monoidal-containers`.
7+
8+## Unreleased
9+
5* `Additive` now lives in `Data.Semigroup.Additive`, but is still reexported
10* `Additive` now lives in `Data.Semigroup.Additive`, but is still reexported
6 from `Data.Patch` for compatability.
11 from `Data.Patch` for compatability.
7
12
patch.cabal+3
@@ -43,6 +43,9 @@ library
43 , transformers >= 0.5.6.0 && < 0.6
43 , transformers >= 0.5.6.0 && < 0.6
44 , witherable >= 0.3 && < 0.5
44 , witherable >= 0.3 && < 0.5
45
45
46+ if impl(ghc < 8.6) -- really, if base < 8.12
47+ build-depends: base-orphans >= 0.8 && < 0.9
48+
46 exposed-modules: Data.Functor.Misc
49 exposed-modules: Data.Functor.Misc
47 , Data.Monoid.DecidablyEmpty
50 , Data.Monoid.DecidablyEmpty
48 , Data.Patch
51 , Data.Patch
src/Data/Semigroup/Additive.hs+4−2
@@ -13,9 +13,11 @@ module Data.Semigroup.Additive
13
13
14import Data.Functor.Const (Const (..))
14import Data.Functor.Const (Const (..))
15import Data.Functor.Identity
15import Data.Functor.Identity
16−-- For base-orphans, TODO don't cheat.
17−import Data.Map.Monoidal ()
18import Data.Proxy
16import Data.Proxy
17+#if !MIN_VERSION_base(4,12,0)
18+-- for :*: and :.: semigroup instances
19+import Data.Orphans ()
20+#endif
19#if !MIN_VERSION_base(4,11,0)
21#if !MIN_VERSION_base(4,11,0)
20import Data.Semigroup (Semigroup (..))
22import Data.Semigroup (Semigroup (..))
21#endif
23#endif