git.iko.soy/patch
on develop help sign in
Merge branch 'develop' into je-clean-up-changelog-traverse
commit494af2b20ca356aa29fe2ae0e9a44e1f30f3383c authorJohn Ericson <John.Ericson@Obsidian.Systems> dateThu 12 Dec 2019, 19:21 (7 years ago) parent7b541315bbfe7d
6 files changed+58−22
compare with develop
unifiedsplit
ChangeLog.md+17 dep/reflex-platform/github.json+3−3 release.nix+27−17 src/Reflex/Network.hs+1−1 src/Reflex/Spider/Internal.hs+9 src/Reflex/Workflow.hs+1−1
ChangeLog.md+17
@@ -4,8 +4,13 @@
44
55* Data.WeakBag.traverse` and `Data.FastWeakBag.traverse` have been deprecated.
66 They are replaced with `Data.WeakBag.traverse_` and `Data.FastWeakBag.traverse_`, respectively.
7+
78* Fixes a bug in `Reflex.Patch.MapWithMove.patchThatSortsMapWith` that was producing invalid `PatchMapWithMove`.
89
10+* Add missing `NotReady` instances:
11+ - `instance NotReady (SpiderTimeline x) (SpiderHost x)`
12+ - `instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x))`
13+
914## 0.6.2.4
1015
1116* Update to monoidal-containers 0.6
@@ -17,7 +22,9 @@
1722## 0.6.2.2
1823
1924* Support these >= 1. Add `split-these` flag to control whether to use new these/semialign combination or not.
25+
2026* Update version bounds to fix some CI failures
27+
2128* Add travis CI configuration
2229
2330## 0.6.2.1
@@ -43,21 +50,31 @@
4350
4451* Fix `holdDyn` so that it is lazy in its event argument
4552 These produce `DMap`s whose values needn't be `Identity`.
53+
4654* Stop using the now-deprecated `*Tag` classes (e.g., `ShowTag`).
55+
4756* Fix `holdDyn` so that it is lazy in its event argument.
4857
4958## 0.6.1.0
5059
5160* Re-export all of `Data.Map.Monoidal`
61+
5262* Fix `QueryT` and `RequesterT` tests
5363
5464## 0.6.0.0 -- 2019-03-20
5565
5666* Deprecate `FunctorMaybe` in favor of `Data.Witherable.Filterable`. We still export `fmapMaybe`, `ffilter`, etc., but they all rely on `Filterable` now.
67+
5768* Rename `MonadDynamicWriter` to `DynamicWriter` and add a deprecation for the old name.
69+
5870* Remove many deprecated functions.
71+
5972* Add a `Num` instance for `Dynamic`.
73+
6074* Add `matchRequestsWithResponses` to make it easier to use `Requester` with protocols that don't do this matching for you.
75+
6176* Add `withRequesterT` to map functions over the request and response of a `RequesterT`.
77+
6278* Suppress nil patches in `QueryT` as an optimization. The `Query` type must now have an `Eq` instance.
79+
6380* Add `throttleBatchWithLag` to `Reflex.Time`. See that module for details.
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−17
@@ -17,26 +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: let
23− reflexSrc = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [
24− "default.nix"
25− "release.nix"
26− ".git"
27− "dist"
28− ])) ./.;
29− in {
30− reflex-dontUseTemplateHaskell = self.callCabal2nixWithOptions "reflex" reflexSrc "-f -use-template-haskell" {};
31− reflex = self.callCabal2nixWithOptions "reflex" reflexSrc "-f +use-template-haskell" {};
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+ ];
3241 };
33− };
34− in {
35− 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);
3646 });
37− in hsPkgs // {
47+ in compilerPkgs // {
3848 cache = reflex-platform.pinBuildInputs "reflex-${system}"
39− (lib.concatLists (map builtins.attrValues (builtins.attrValues hsPkgs)));
49+ (map (a: a.cache) (builtins.attrValues compilerPkgs));
4050 });
4151
4252 metaCache = native-reflex-platform.pinBuildInputs "reflex-everywhere"
src/Reflex/Network.hs+1−1
@@ -20,7 +20,7 @@ import Reflex.NotReady.Class
2020import Reflex.PostBuild.Class
2121
2222-- | A 'Dynamic' "network": Takes a 'Dynamic' of network-creating actions and replaces the network whenever the 'Dynamic' updates.
23−-- The returned Event of network results fires when the 'Dynamic' updates.
23+-- The returned Event of network results fires at post-build time and when the 'Dynamic' updates.
2424-- Note: Often, the type 'a' is an Event, in which case the return value is an Event-of-Events, where the outer 'Event' fires
2525-- when switching networks. Such an 'Event' would typically be flattened (via 'switchPromptly').
2626networkView :: (NotReady t m, Adjustable t m, PostBuild t m) => Dynamic t (m a) -> m (Event t a)
src/Reflex/Spider/Internal.hs+9
@@ -103,6 +103,7 @@ import qualified Reflex.Host.Class
103103import Reflex.NotReady.Class
104104import Reflex.Patch
105105import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
106+import Reflex.PerformEvent.Base (PerformEventT)
106107
107108#ifdef DEBUG_TRACE_EVENTS
108109import qualified Data.ByteString.Char8 as BS8
@@ -2705,3 +2706,11 @@ instance MonadAtomicRef (SpiderHostFrame x) where
27052706instance PrimMonad (SpiderHostFrame x) where
27062707 type PrimState (SpiderHostFrame x) = PrimState IO
27072708 primitive = SpiderHostFrame . EventM . primitive
2709+
2710+instance NotReady (SpiderTimeline x) (SpiderHost x) where
2711+ notReadyUntil _ = return ()
2712+ notReady = return ()
2713+
2714+instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where
2715+ notReadyUntil _ = return ()
2716+ notReady = return ()
src/Reflex/Workflow.hs+1−1
@@ -34,7 +34,7 @@ workflow w0 = do
3434 rec eResult <- networkHold (unWorkflow w0) $ fmap unWorkflow $ switch $ snd <$> current eResult
3535 return $ fmap fst eResult
3636
37−-- | Similar to 'workflow', but outputs an 'Event' that fires whenever the current 'Workflow' is replaced by the next 'Workflow'.
37+-- | Similar to 'workflow', but outputs an 'Event' that fires at post-build time and whenever the current 'Workflow' is replaced by the next 'Workflow'.
3838workflowView :: forall t m a. (Reflex t, NotReady t m, Adjustable t m, MonadFix m, MonadHold t m, PostBuild t m) => Workflow t m a -> m (Event t a)
3939workflowView w0 = do
4040 rec eResult <- networkView . fmap unWorkflow =<< holdDyn w0 eReplace