Merge remote-tracking branch 'origin/develop' into HEAD

Author: Ericson2314

.github/workflows/haskell.yml

@@ -1,12 +1,12 @@
 name: github-action
 
-on: [push, pull_request] 
+on: [push, pull_request]
 
 jobs:
   build:
     strategy:
       matrix:
-        ghc: ['8.0.2', '8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.2']
+        ghc: ['8.0.2', '8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.1', '9.2.2']
         os: ['ubuntu-latest', 'macos-latest']
         exclude:
           # There are some linker warnings in 802 on darwin that
@@ -19,7 +19,7 @@ jobs:
     name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-haskell@v1
+    - uses: haskell/actions/setup@v1
       with:
         ghc-version: ${{ matrix.ghc }}
     - name: Cache
@@ -42,6 +42,6 @@ jobs:
     - name: Build
       run: cabal build --enable-tests --enable-benchmarks all
     - name: Run tests
-      run: cabal test all
+      run: cabal test --enable-tests all
     - name: Build Docs
       run: cabal haddock

.travis.yml

@@ -6,31 +6,62 @@
 
 * `PatchDMapWithMove` supports moves with a patch.
 
+## 0.0.7.0 - 2022-06-23
+
+* 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
+
+* New dep of `base-orphans` for old GHC to get instances honestly instead of
+  via `monoidal-containers`.
+
+## 0.0.5.0 - 2021-12-17
+
+* `Additive` now lives in `Data.Semigroup.Additive`, but is still reexported
+  from `Data.Patch` for compatability.
+
 * Rewrite `PatchMapWithMove` in terms of `PatchMapWithPatchingMove`.
   Care is taken to make this not a breaking change.
   In particular, `PatchMapWithMove` is a newtype of `PatchMapWithPatchingMove`, as is the `NodeInfo` and `From` of `PatchMapWithPatchingMove`'s versions of those.
   There are complete constructor and field patterns too, and everything is
   exported under the newtype as real constructors and fields would be.
 
-## 0.0.4.0
+## 0.0.4.0 - 2021-04-20
 
 * Enable PolyKinds
 
-## 0.0.3.2
+## 0.0.3.2 - 2020-11-06
 
 * Update version bounds
 
-## 0.0.3.1
+## 0.0.3.1 - 2020-02-05
 
 * Replace `fromJust` with something easier to debug.
 
-## 0.0.3.0
+## 0.0.3.0 - 2020-02-05
 
 * Create `PatchMapWithPatchingMove` variant which supports moves with a patch.
 
 * Create `DecidablyEmpty` subclass of `Monoid`.
 
-## 0.0.2.0
+## 0.0.2.0 - 2020-01-17
 
 * Consistently provide:
 
@@ -42,16 +73,16 @@
 
   for `PatchMap`, `PatchIntMap`, and `PatchMapWithMove`.
 
-## 0.0.1.0
+## 0.0.1.0 - 2020-01-09
 
 * Support older GHCs with `split-these` flag.
 
 * Additional instances for the `Group` class for basic types.
 
-## 0.0.0.1
+## 0.0.0.1 - 2020-01-08
 
 * Remove unneeded dependencies
 
-## 0.0.0.0
+## 0.0.0.0 - 2020-01-08
 
 * Extract patching functionality from Reflex.

ChangeLog.md

@@ -1,8 +1,2 @@
 # DO NOT HAND-EDIT THIS FILE
-let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
-  if !fetchSubmodules && !private then builtins.fetchTarball {
-    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
-  } else (import <nixpkgs> {}).fetchFromGitHub {
-    inherit owner repo rev sha256 fetchSubmodules private;
-  };
-in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))
+import (import ./thunk.nix)

cabal.haskell-ci

@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-platform",
-  "branch": "master",
+  "branch": "develop",
   "private": false,
-  "rev": "c9d11db1b98855fe8ab24a3ff6a5dbe0ad902ad9",
-  "sha256": "0sfzkqdvyah5mwvmli0wq1nl0b8cvk2cmfgfy4rz57wv42x3099y"
+  "rev": "ac66356c8839d1dc16cc60887c2db5988a60e6c4",
+  "sha256": "0zk8pf72lid6cqq4mlr1mcwh6zd5lz9i83kw519aci6mfba1afvq"
 }

dep/reflex-platform/default.nix

@@ -0,0 +1,9 @@
+# DO NOT HAND-EDIT THIS FILE
+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
+  if !fetchSubmodules && !private then builtins.fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
+  } else (import <nixpkgs> {}).fetchFromGitHub {
+    inherit owner repo rev sha256 fetchSubmodules private;
+  };
+  json = builtins.fromJSON (builtins.readFile ./github.json);
+in fetch json