git.iko.soy/obelisk
on master help sign in
Merge pull request #104 from obsidiansystems/reunification
8873de6Luigy Leon
default.nix−13
compare with master
unifiedsplit
@@ -66,19 +66,6 @@ let
66 sha256 = "0dpwi5ffs88brl3lz51bwb004c6zm8ds8pkw1vzsg2a6aaiyhlzl";
66 sha256 = "0dpwi5ffs88brl3lz51bwb004c6zm8ds8pkw1vzsg2a6aaiyhlzl";
67 }) {});
67 }) {});
68
68
69− # Default hpack in the package set does not evaluate.
70− # TODO: Remove this override after reunification with upstream nixpkgs.
71− hpack = pkgs.haskell.lib.dontCheck (self.callHackage "hpack" "0.28.2" {});
72−
73− monoidal-containers =
74− let src = pkgs.fetchFromGitHub {
75− owner = "obsidiansystems";
76− repo = "monoidal-containers";
77− rev = "af5f6cedd1acd8725b19fd6a0277f83906603491";
78− sha256 = "11v20ing8lrb5ccf6g9iihwcw5d22yj2ifw15v04ypn19y8kariw";
79− };
80− in pkgs.haskell.lib.dontCheck (self.callCabal2nix "monoidal-containers" src {});
81−
82 # Need deriveSomeUniverse
69 # Need deriveSomeUniverse
83 # PR: https://github.com/dmwit/universe/pull/32
70 # PR: https://github.com/dmwit/universe/pull/32
84 universe-template = self.callCabal2nix "universe-template" (pkgs.fetchFromGitHub {
71 universe-template = self.callCabal2nix "universe-template" (pkgs.fetchFromGitHub {
dep/reflex-platform/github.json+2−3
@@ -1,7 +1,6 @@
1{
1{
2 "owner": "reflex-frp",
2 "owner": "reflex-frp",
3 "repo": "reflex-platform",
3 "repo": "reflex-platform",
4− "branch": "routes",
4+ "rev": "df2d29d34746c36d11444498c360da1173f31436",
5− "rev": "247e135920fcadc6d19ee2ab56a8d9f976e0a49d",
5+ "sha256": "15lqdqd23vpzhqnip7c235a0pyjyfbmljnssp7502gkgj09wxmmn"
6− "sha256": "0i8yng9m4kwkvn1x9gbwn2cr2li45nik5zfkqck3gijcsyy1j76h"
7}
6}
lib/route/src/Obelisk/Route/Frontend.hs+6−1
@@ -86,7 +86,7 @@ newtype RoutedT t r m a = RoutedT { unRoutedT :: ReaderT (Dynamic t r) m a }
86instance Prerender js m => Prerender js (RoutedT t r m) where
86instance Prerender js m => Prerender js (RoutedT t r m) where
87 prerenderClientDict = fmap (\Dict -> Dict) (prerenderClientDict :: Maybe (Dict (PrerenderClientConstraint js m)))
87 prerenderClientDict = fmap (\Dict -> Dict) (prerenderClientDict :: Maybe (Dict (PrerenderClientConstraint js m)))
88
88
89−instance (Requester t m, PrimMonad m) => Requester t (RoutedT t r m) where
89+instance Requester t m => Requester t (RoutedT t r m) where
90 type Request (RoutedT t r m) = Request m
90 type Request (RoutedT t r m) = Request m
91 type Response (RoutedT t r m) = Response m
91 type Response (RoutedT t r m) = Response m
92 requesting = RoutedT . requesting
92 requesting = RoutedT . requesting
@@ -131,6 +131,11 @@ instance Adjustable t m => Adjustable t (RoutedT t r m) where
131 traverseDMapWithKeyWithAdjust f a0 a' = RoutedT $ traverseDMapWithKeyWithAdjust (\k v -> coerce $ f k v) (coerce a0) $ coerce a'
131 traverseDMapWithKeyWithAdjust f a0 a' = RoutedT $ traverseDMapWithKeyWithAdjust (\k v -> coerce $ f k v) (coerce a0) $ coerce a'
132 traverseDMapWithKeyWithAdjustWithMove f a0 a' = RoutedT $ traverseDMapWithKeyWithAdjustWithMove (\k v -> coerce $ f k v) (coerce a0) $ coerce a'
132 traverseDMapWithKeyWithAdjustWithMove f a0 a' = RoutedT $ traverseDMapWithKeyWithAdjustWithMove (\k v -> coerce $ f k v) (coerce a0) $ coerce a'
133
133
134+instance (Monad m, MonadQuery t vs m) => MonadQuery t vs (RoutedT t r m) where
135+ tellQueryIncremental = lift . tellQueryIncremental
136+ askQueryResult = lift askQueryResult
137+ queryIncremental = lift . queryIncremental
138+
134runRoutedT :: RoutedT t r m a -> Dynamic t r -> m a
139runRoutedT :: RoutedT t r m a -> Dynamic t r -> m a
135runRoutedT = runReaderT . unRoutedT
140runRoutedT = runReaderT . unRoutedT
136
141