Merge remote-tracking branch 'origin/develop' into no-group

ChangeLog.md

@@ -9,8 +9,26 @@
   orphan for backwards compat, temporarily, but it should eventually be removed
   everywhere.
 
-* `Additive` is still defined, because the `Abelian` from `groups` has too
-  stringent a constraint.
+## Unreleased
+
+* Use `commutative-semigroups` for `Commutative`, making `Additive` a
+  deprecated alias.
+
+## 0.0.6.0 - 2022-06-10
+
+* Add `PatchOrReplacement`, patch which either is some other patch type or a
+  new replacement value.
+
+* Support GHC 9.2
+
+## 0.0.5.2 - 2022-01-09
+
+* Correct field order of `PatchMapWithMove.NodeInfo`.
+
+  When we this was reimplemented as a pattern synonym wrapper in 0.0.5.0, we
+  accidentally flipped the argument order. Reversing it now to match 0.0.4.0
+  and restore compatibility. The previous releases in the 0.0.5.\* series will
+  correspondingly be deprecated.
 
 ## 0.0.5.1 - 2021-12-28
 

dep/reflex-platform/github.json

@@ -3,6 +3,6 @@
   "repo": "reflex-platform",
   "branch": "develop",
   "private": false,
-  "rev": "efc6d923c633207d18bd4d8cae3e20110a377864",
-  "sha256": "121rmnkx8nwiy96ipfyyv6vrgysv0zpr2br46y70zf4d0y1h1lz5"
+  "rev": "ac66356c8839d1dc16cc60887c2db5988a60e6c4",
+  "sha256": "0zk8pf72lid6cqq4mlr1mcwh6zd5lz9i83kw519aci6mfba1afvq"
 }

patch.cabal

@@ -66,7 +66,7 @@ library
 
   if flag(split-these)
     build-depends: these >= 1 && <1.2
-                 , semialign >=1 && <1.2
+                 , semialign >=1 && <1.3
   else
     build-depends: these >= 0.4 && <0.9
 

src/Data/Patch.hs

@@ -32,7 +32,7 @@ import Data.Patch.MapWithMove as X
   , unsafePatchMapWithMove
   )
 
--- | The elements of an 'Additive' 'Semigroup' can be considered as patches of their own type.
+-- | The elements of an 'Commutative' 'Semigroup' can be considered as patches of their own type.
 newtype AdditivePatch p = AdditivePatch { unAdditivePatch :: p }
 
 instance Commutative p => Patch (AdditivePatch p) where