git.iko.soy/patch
on develop help sign in
Merge pull request #30 from reflex-frp/proper-orphans-dep

Honestly get instances from Data.Orphans

commit668ab06274bda4a2f0c22a0936eebdce8566629b authorJohn Ericson <John.Ericson@Obsidian.Systems> dateFri 17 Dec 2021, 17:30 (5 years ago) parent0dfe779ffd3bd9
3 files changed+12−2
compare with develop
unifiedsplit
ChangeLog.md+5 patch.cabal+3 src/Data/Semigroup/Additive.hs+4−2
ChangeLog.md+5
@@ -2,6 +2,11 @@
22
33## Unreleased
44
5+* New dep of `data-orphans` for old GHC to get instances honestly instead of
6+ via `monoidal-containers`.
7+
8+## Unreleased
9+
510* `Additive` now lives in `Data.Semigroup.Additive`, but is still reexported
611 from `Data.Patch` for compatability.
712
patch.cabal+3
@@ -43,6 +43,9 @@ library
4343 , transformers >= 0.5.6.0 && < 0.6
4444 , witherable >= 0.3 && < 0.5
4545
46+ if impl(ghc < 8.6) -- really, if base < 8.12
47+ build-depends: base-orphans >= 0.8 && < 0.9
48+
4649 exposed-modules: Data.Functor.Misc
4750 , Data.Monoid.DecidablyEmpty
4851 , Data.Patch
src/Data/Semigroup/Additive.hs+4−2
@@ -13,9 +13,11 @@ module Data.Semigroup.Additive
1313
1414import Data.Functor.Const (Const (..))
1515import Data.Functor.Identity
16−-- For base-orphans, TODO don't cheat.
17−import Data.Map.Monoidal ()
1816import Data.Proxy
17+#if !MIN_VERSION_base(4,12,0)
18+-- for :*: and :.: semigroup instances
19+import Data.Orphans ()
20+#endif
1921#if !MIN_VERSION_base(4,11,0)
2022import Data.Semigroup (Semigroup (..))
2123#endif