11cb165 · servant-reflex

.travis.yml+1

compare with master

unifiedsplit

@@ -12,5 +12,6 @@ before_script:

12

13script:

14 - nix-build travis.nix -A build

15+ - nix-build travis.nix -A buildGhc

15 - nix-build travis.nix -A testserver

16 - nix-build travis.nix -A testserver

16 - nix-build travis.nix -A testresults

17 - nix-build travis.nix -A testresults

default.nix+9−17

@@ -1,28 +1,20 @@

1−{ mkDerivation, aeson, base, bytestring, case-insensitive

1+{ mkDerivation, base, bytestring, case-insensitive, containers

2−, containers, data-default, exceptions, ghcjs-dom, http-api-data

2+, data-default, exceptions, ghcjs-dom, http-api-data, http-media

3−, http-media, jsaddle, mtl, network-uri, reflex, reflex-dom-core

3+, jsaddle, mtl, network-uri, reflex, reflex-dom, reflex-dom-core

4−, safe, scientific, servant, servant-auth, stdenv

4+, safe, servant, servant-auth, stdenv, string-conversions, text

5−, string-conversions, text, transformers

5+, transformers

6}:

7mkDerivation {

8 pname = "servant-reflex";

9− version = "0.3.5";

9+ version = "0.3.6";

10− src = builtins.filterSource

11− (path: type:

12− baseNameOf path != "result"

13− && baseNameOf path != "nix"

14− ) ./.;

10+ src = ./.;

15− configureFlags = [ "-fexample" ];

16 isLibrary = true;

11 isLibrary = true;

17 isExecutable = true;

12 isExecutable = true;

18 libraryHaskellDepends = [

13 libraryHaskellDepends = [

19 base bytestring case-insensitive containers data-default exceptions

14 base bytestring case-insensitive containers data-default exceptions

20 ghcjs-dom http-api-data http-media jsaddle mtl network-uri reflex

15 ghcjs-dom http-api-data http-media jsaddle mtl network-uri reflex

21− reflex-dom-core safe servant servant-auth string-conversions text

16+ reflex-dom reflex-dom-core safe servant servant-auth string-conversions

22− transformers

17+ text transformers

23− ];

24− executableHaskellDepends = [

25− aeson base reflex reflex-dom-core scientific servant text

26 ];

18 ];

27 description = "servant API generator for reflex apps";

19 description = "servant API generator for reflex apps";

28 license = stdenv.lib.licenses.bsd3;

20 license = stdenv.lib.licenses.bsd3;

exec/Example.hs+2−1

@@ -21,7 +21,8 @@ import Servant.API

21import API

22import Data.Proxy

23import Text.Read (readMaybe)

24−import Reflex.Dom.Core hiding (run)

24+import Reflex.Dom.Core hiding (run, mainWidget)

25+import Reflex.Dom (mainWidget)

25------------------------------------------------------------------------------

26------------------------------------------------------------------------------

26import Servant.Reflex

27import Servant.Reflex

27import Servant.Reflex.Multi

28import Servant.Reflex.Multi

servant-reflex.cabal+1

@@ -61,6 +61,7 @@ executable example

61 base,

62 scientific,

63 servant,

64+ reflex-dom,

64 reflex-dom-core,

65 reflex-dom-core,

65 text

66 text

66 default-language: Haskell2010

67 default-language: Haskell2010

travis.nix+1

@@ -48,6 +48,7 @@ in

48 inherit reflexPlatform ghcPkgs ghcjsPkgs;

49

50 build = ghcjsPkgs.servant-reflex;

51+ buildGhc = ghcPkgs.servant-reflex;

51 testserver = ghcPkgs.testserver;

52 testserver = ghcPkgs.testserver;

52 testdriver = ghcPkgs.testdriver;

53 testdriver = ghcPkgs.testdriver;

53 inherit testresults;

54 inherit testresults;