Merge pull request #30 from reflex-frp/proper-orphans-dep

Honestly get instances from Data.Orphans

Author: Ericson2314

ChangeLog.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+* New dep of `data-orphans` for old GHC to get instances honestly instead of
+  via `monoidal-containers`.
+
+## Unreleased
+
 * `Additive` now lives in `Data.Semigroup.Additive`, but is still reexported
   from `Data.Patch` for compatability.
 

patch.cabal

@@ -43,6 +43,9 @@ library
                , transformers >= 0.5.6.0 && < 0.6
                , witherable >= 0.3 && < 0.5
 
+  if impl(ghc < 8.6) -- really, if base < 8.12
+    build-depends: base-orphans >= 0.8 && < 0.9
+
   exposed-modules: Data.Functor.Misc
                  , Data.Monoid.DecidablyEmpty
                  , Data.Patch

src/Data/Semigroup/Additive.hs

@@ -13,9 +13,11 @@ module Data.Semigroup.Additive
 
 import Data.Functor.Const (Const (..))
 import Data.Functor.Identity
--- For base-orphans, TODO don't cheat.
-import Data.Map.Monoidal ()
 import Data.Proxy
+#if !MIN_VERSION_base(4,12,0)
+-- for :*: and :.: semigroup instances
+import Data.Orphans ()
+#endif
 #if !MIN_VERSION_base(4,11,0)
 import Data.Semigroup (Semigroup (..))
 #endif