1c0ec5e · servant-reflex

.gitmodules+3−3

compare with master

unifiedsplit

@@ -1,9 +1,6 @@

1[submodule "deps/reflex-dom-contrib"]

2 path = deps/reflex-dom-contrib

3 url = git@github.com:reflex-frp/reflex-dom-contrib.git

4−[submodule "deps/try-reflex"]

5− path = deps/try-reflex

6− url = git@github.com:ryantrinkle/try-reflex.git

7[submodule "deps/servant"]

4[submodule "deps/servant"]

8 path = deps/servant

5 path = deps/servant

9 url = https://github.com/haskell-servant/servant.git

6 url = https://github.com/haskell-servant/servant.git

@@ -16,3 +13,6 @@

16[submodule "deps/reflex"]

13[submodule "deps/reflex"]

17 path = deps/reflex

14 path = deps/reflex

18 url = https://github.com/ryantrinkle/reflex

15 url = https://github.com/ryantrinkle/reflex

16+[submodule "deps/reflex-platform"]

17+ path = deps/reflex-platform

18+ url = https://github.com/reflex-frp/reflex-platform.git

build.sh+1−1

@@ -1,3 +1,3 @@

1#!/bin/sh

2

3−deps/try-reflex/work-on ./overrides.nix ./. --run "cabal configure --ghcjs ; cabal build"

3+deps/reflex-platform/work-on ./overrides.nix ./. --run "cabal configure --ghcjs ; cabal build"

deps/reflex-platformnew file+1

Submodule changed.

deps/try-reflexdeleted−1

Submodule changed.

exec/API.hs+25

@@ -15,3 +15,28 @@ type API = "getunit" :> Get '[JSON] ()

15 :<|> "double" :> ReqBody '[JSON] Double

16 :> Post '[JSON] Double

17 :<|> Raw

18+

19+type GET = Get '[JSON] ()

20+

21+-- Imported the comprehensive API example for testing.

22+-- https://github.com/haskell-servant/servant/blob/master/servant/src/Servant/API/Internal/Test/ComprehensiveAPI.hs

23+type ComprehensiveAPI =

24+ GET :<|>

25+ Get '[JSON] Int :<|>

26+ Capture "foo" Int :> GET :<|>

27+ Header "foo" Int :> GET :<|>

28+ HttpVersion :> GET :<|>

29+ IsSecure :> GET :<|>

30+ QueryParam "foo" Int :> GET :<|>

31+ QueryParams "foo" Int :> GET :<|>

32+ QueryFlag "foo" :> GET :<|>

33+-- Raw :<|>

34+ RemoteHost :> GET :<|>

35+ ReqBody '[JSON] Int :> GET :<|>

36+ Get '[JSON] (Headers '[Header "foo" Int] ()) :<|>

37+ "foo" :> GET :<|>

38+ Vault :> GET :<|>

39+ Verb 'POST 204 '[JSON] () :<|>

40+ Verb 'POST 204 '[JSON] Int

41+-- This one isn't in scope

42+-- :<|> WithNamedContext "foo" '[] GET

overrides.nix+4−5

@@ -1,11 +1,10 @@

1−{ try-reflex, ... }:

1+{ reflex-platform, ... }:

2let

3 pkgs = import <nixpkgs> {};

4− try-reflex = import deps/try-reflex {};

4+ reflex-platform = import deps/reflex-platform {};

5−in try-reflex.ghcjs.override {

5+in reflex-platform.ghcjs.override {

6 overrides = self: super: {

7− self.lens = pkgs.haskell.lib.dontCheck (self.lens);

8 reflex-dom-contrib = pkgs.haskell.lib.dontCheck (self.callPackage deps/reflex-dom-contrib {});

7 reflex-dom-contrib = pkgs.haskell.lib.dontCheck (self.callPackage deps/reflex-dom-contrib {});

9− servant = self.callPackage (try-reflex.cabal2nixResult deps/servant/servant) {};

8+ servant = self.callPackage (reflex-platform.cabal2nixResult deps/servant/servant) {};

10 };

9 };

11}

10}

shell.sh+1−1

@@ -1,3 +1,3 @@

1#!/bin/sh

2

3−deps/try-reflex/work-on ./overrides.nix ./.

3+deps/reflex-platform/work-on ./overrides.nix ./.

testserver/Main.hs+1−1

@@ -65,7 +65,7 @@ test = serve testApi server

65initApp :: SnapletInit App App

66initApp = makeSnaplet "myapp" "example" Nothing $ do

67 addRoutes [("", applicationToSnap test)

68−-- ,("", serveDirectory "static")

68+ ,("", serveDirectory "static")

69 ]

70 return App

71