Merge branch 'develop' into clarify-view-docs

Author: Ericson2314

ChangeLog.md

@@ -5,6 +5,7 @@
 * Data.WeakBag.traverse and Data.FastWeakBag.traverse have been
   renamed to Data.WeakBag.traverse_ and Data.FastWeakBag.traverse_
   respectively.
+* Fixes a bug in `Reflex.Patch.MapWithMove.patchThatSortsMapWith` that was producing invalid `PatchMapWithMove`.
 
 ## 0.6.2.4
 

default.nix

@@ -1,7 +1,7 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-platform",
-  "branch": "jailbreakTheselens",
-  "rev": "4284ed527c96c373538dc7e31776d9a50ca6aa91",
-  "sha256": "1m1nkxq7ng9wnqbd77xn8d81f2iz8g61y5m0r3gp0gi0q59jm8ay"
+  "branch": "develop",
+  "rev": "e7b76dd552a10916c7d8702c11292dac4f4299ea",
+  "sha256": "0s1183arrwldcs50qhzgnv94v24n9bgq6dfq64wp0a3q2nzyvgwh"
 }

dep/reflex-platform/github.json

@@ -17,19 +17,36 @@ let
     ] ++ lib.optionals (reflex-platform.iosSupport) [
       "ghcIosAarch64"
     ];
-    hsPkgs = lib.genAttrs compilers (ghc: let
-      ghc' = reflex-platform.${ghc}.override {
-        overrides = self: super: {
-          reflex-dontUseTemplateHaskell = self.callPackage ./. { useTemplateHaskell = false; };
-          reflex = self.callPackage ./. { useTemplateHaskell = true; };
+    variations = map (v: "reflex" + v) [
+      "-dontUseTemplateHaskell"
+      ""
+    ];
+    compilerPkgs = lib.genAttrs compilers (ghc: let
+      variationPkgs = lib.genAttrs variations (variation: let
+        reflex-platform = reflex-platform-fun {
+          inherit system;
+          __useTemplateHaskell = variation == "reflex"; # TODO hack
+          haskellOverlays = [
+            # Use this package's source for reflex
+            (self: super: {
+              _dep = super._dep // {
+                reflex = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [
+                  "release.nix"
+                  ".git"
+                  "dist"
+                ])) ./.;
+              };
+            })
+          ];
         };
-      };
-    in {
-      inherit (ghc') reflex reflex-dontUseTemplateHaskell;
+      in reflex-platform.${ghc}.reflex);
+    in variationPkgs // {
+      cache = reflex-platform.pinBuildInputs "reflex-${system}-${ghc}"
+        (builtins.attrValues variationPkgs);
     });
-  in hsPkgs // {
+  in compilerPkgs // {
     cache = reflex-platform.pinBuildInputs "reflex-${system}"
-      (lib.concatLists (map builtins.attrValues (builtins.attrValues hsPkgs)));
+      (map (a: a.cache) (builtins.attrValues compilerPkgs));
   });
 
   metaCache = native-reflex-platform.pinBuildInputs "reflex-everywhere"

release.nix

@@ -155,7 +155,7 @@ patchThatSortsMapWith cmp m = PatchMapWithMove $ Map.fromList $ catMaybes $ zipW
           Just (from, to)
         reverseMapping = Map.fromList $ catMaybes $ zipWith f unsorted sorted
         g (to, _) (from, _) = if to == from then Nothing else
-          let Just movingTo = Map.lookup from reverseMapping
+          let Just movingTo = Map.lookup to reverseMapping
           in Just (to, NodeInfo (From_Move from) $ Just movingTo)
 
 -- | Create a 'PatchMapWithMove' that, if applied to the first 'Map' provided,