on develop help sign in
Merge branch 'develop' into clarify-view-docs
commitab83e257d92cb6ad1ee62513389dc3727f117163 authorJohn Ericson <John.Ericson@Obsidian.Systems> dateThu 12 Dec 2019, 13:40 (7 years ago) parent0acbdbed79405c
5 files changed+32−63
ChangeLog.md+1 default.nix−49 dep/reflex-platform/github.json+3−3 release.nix+27−10 src/Reflex/Patch/MapWithMove.hs+1−1
ChangeLog.md+1
@@ -5,6 +5,7 @@
55* Data.WeakBag.traverse and Data.FastWeakBag.traverse have been
66 renamed to Data.WeakBag.traverse_ and Data.FastWeakBag.traverse_
77 respectively.
8+* Fixes a bug in `Reflex.Patch.MapWithMove.patchThatSortsMapWith` that was producing invalid `PatchMapWithMove`.
89
910## 0.6.2.4
1011
default.nixdeleted−49
@@ -1,49 +0,0 @@
1−{ mkDerivation, ghc, base, bifunctors, containers, deepseq
2−, dependent-map, dependent-sum, exception-transformers
3−, haskell-src-exts, haskell-src-meta, hlint, lens, MemoTrie
4−, monad-control, mtl, primitive, random, ref-tf
5−, semigroupoids , semigroups, split, stdenv, stm, syb
6−, template-haskell , these, time, transformers
7−, transformers-compat, unbounded-delays, prim-uniq
8−, data-default, filepath, directory, filemanip, ghcjs-base
9−, monoidal-containers, witherable, profunctors
10−, splitThese ? (semialign != null), semialign ? null, these-lens ? null
11−, useTemplateHaskell ? true
12−}:
13−mkDerivation {
14− pname = "reflex";
15− version = "0.6.2.4";
16− src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [
17− "default.nix"
18− "release.nix"
19− ".git"
20− "dist"
21− ])) ./.;
22− libraryHaskellDepends = [
23− base bifunctors containers dependent-map dependent-sum
24− exception-transformers lens
25− MemoTrie monad-control mtl primitive ref-tf semigroupoids
26− semigroups stm syb template-haskell these transformers
27− transformers-compat prim-uniq
28− base bifunctors containers deepseq dependent-map dependent-sum
29− mtl ref-tf split transformers data-default
30− random time unbounded-delays monoidal-containers witherable
31− profunctors
32− ] ++ (if ghc.isGhcjs or false then [
33− ghcjs-base
34− ] else []) ++ (if !useTemplateHaskell then [] else [
35− haskell-src-exts haskell-src-meta
36− ]) ++ (if splitThese then [
37− semialign
38− these-lens
39− ] else []);
40− testHaskellDepends = if ghc.isGhcjs or false then [] else [
41− hlint filepath directory filemanip
42− ];
43− configureFlags =
44− stdenv.lib.optional (!useTemplateHaskell) [ "-f-use-template-haskell" ] ++
45− stdenv.lib.optional (!splitThese) [ "-f-split-these" ];
46− homepage = "https://github.com/reflex-frp/reflex";
47− description = "Higher-order Functional Reactive Programming";
48− license = stdenv.lib.licenses.bsd3;
49−}
dep/reflex-platform/github.json+3−3
@@ -1,7 +1,7 @@
11{
22 "owner": "reflex-frp",
33 "repo": "reflex-platform",
4− "branch": "jailbreakTheselens",
5− "rev": "4284ed527c96c373538dc7e31776d9a50ca6aa91",
6− "sha256": "1m1nkxq7ng9wnqbd77xn8d81f2iz8g61y5m0r3gp0gi0q59jm8ay"
4+ "branch": "develop",
5+ "rev": "e7b76dd552a10916c7d8702c11292dac4f4299ea",
6+ "sha256": "0s1183arrwldcs50qhzgnv94v24n9bgq6dfq64wp0a3q2nzyvgwh"
77}
release.nix+27−10
@@ -17,19 +17,36 @@ let
1717 ] ++ lib.optionals (reflex-platform.iosSupport) [
1818 "ghcIosAarch64"
1919 ];
20− hsPkgs = lib.genAttrs compilers (ghc: let
21− ghc' = reflex-platform.${ghc}.override {
22− overrides = self: super: {
23− reflex-dontUseTemplateHaskell = self.callPackage ./. { useTemplateHaskell = false; };
24− reflex = self.callPackage ./. { useTemplateHaskell = true; };
20+ variations = map (v: "reflex" + v) [
21+ "-dontUseTemplateHaskell"
22+ ""
23+ ];
24+ compilerPkgs = lib.genAttrs compilers (ghc: let
25+ variationPkgs = lib.genAttrs variations (variation: let
26+ reflex-platform = reflex-platform-fun {
27+ inherit system;
28+ __useTemplateHaskell = variation == "reflex"; # TODO hack
29+ haskellOverlays = [
30+ # Use this package's source for reflex
31+ (self: super: {
32+ _dep = super._dep // {
33+ reflex = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [
34+ "release.nix"
35+ ".git"
36+ "dist"
37+ ])) ./.;
38+ };
39+ })
40+ ];
2541 };
26− };
27− in {
28− inherit (ghc') reflex reflex-dontUseTemplateHaskell;
42+ in reflex-platform.${ghc}.reflex);
43+ in variationPkgs // {
44+ cache = reflex-platform.pinBuildInputs "reflex-${system}-${ghc}"
45+ (builtins.attrValues variationPkgs);
2946 });
30− in hsPkgs // {
47+ in compilerPkgs // {
3148 cache = reflex-platform.pinBuildInputs "reflex-${system}"
32− (lib.concatLists (map builtins.attrValues (builtins.attrValues hsPkgs)));
49+ (map (a: a.cache) (builtins.attrValues compilerPkgs));
3350 });
3451
3552 metaCache = native-reflex-platform.pinBuildInputs "reflex-everywhere"
src/Reflex/Patch/MapWithMove.hs+1−1
@@ -155,7 +155,7 @@ patchThatSortsMapWith cmp m = PatchMapWithMove $ Map.fromList $ catMaybes $ zipW
155155 Just (from, to)
156156 reverseMapping = Map.fromList $ catMaybes $ zipWith f unsorted sorted
157157 g (to, _) (from, _) = if to == from then Nothing else
158− let Just movingTo = Map.lookup from reverseMapping
158+ let Just movingTo = Map.lookup to reverseMapping
159159 in Just (to, NodeInfo (From_Move from) $ Just movingTo)
160160
161161-- | Create a 'PatchMapWithMove' that, if applied to the first 'Map' provided,