git.iko.soy/typeable/servant-reflex
on master help sign in
Merge pull request #107 from imalsogreg/mainWidget

use a mainWidget that works with ghc and ghcjs

commit950e32205105fdfcb28efe68e47b1c28f8420d5a authorGreg Hale <ImAlsoGreg@gmail.com> dateMon 25 Jan 2021, 12:10 (6 years ago) parent110904311cb165
5 files changed+14−18
.travis.yml+1 default.nix+9−17 exec/Example.hs+2−1 servant-reflex.cabal+1 travis.nix+1
.travis.yml+1
@@ -12,5 +12,6 @@ before_script:
1212
1313script:
1414 - nix-build travis.nix -A build
15+ - nix-build travis.nix -A buildGhc
1516 - nix-build travis.nix -A testserver
1617 - nix-build travis.nix -A testresults
default.nix+9−17
@@ -1,28 +1,20 @@
1−{ mkDerivation, aeson, base, bytestring, case-insensitive
2−, containers, data-default, exceptions, ghcjs-dom, http-api-data
3−, http-media, jsaddle, mtl, network-uri, reflex, reflex-dom-core
4−, safe, scientific, servant, servant-auth, stdenv
5−, string-conversions, text, transformers
1+{ mkDerivation, base, bytestring, case-insensitive, containers
2+, data-default, exceptions, ghcjs-dom, http-api-data, http-media
3+, jsaddle, mtl, network-uri, reflex, reflex-dom, reflex-dom-core
4+, safe, servant, servant-auth, stdenv, string-conversions, text
5+, transformers
66}:
77mkDerivation {
88 pname = "servant-reflex";
9− version = "0.3.5";
10− src = builtins.filterSource
11− (path: type:
12− baseNameOf path != "result"
13− && baseNameOf path != "nix"
14− ) ./.;
15− configureFlags = [ "-fexample" ];
9+ version = "0.3.6";
10+ src = ./.;
1611 isLibrary = true;
1712 isExecutable = true;
1813 libraryHaskellDepends = [
1914 base bytestring case-insensitive containers data-default exceptions
2015 ghcjs-dom http-api-data http-media jsaddle mtl network-uri reflex
21− reflex-dom-core safe servant servant-auth string-conversions text
22− transformers
23− ];
24− executableHaskellDepends = [
25− aeson base reflex reflex-dom-core scientific servant text
16+ reflex-dom reflex-dom-core safe servant servant-auth string-conversions
17+ text transformers
2618 ];
2719 description = "servant API generator for reflex apps";
2820 license = stdenv.lib.licenses.bsd3;
exec/Example.hs+2−1
@@ -21,7 +21,8 @@ import Servant.API
2121import API
2222import Data.Proxy
2323import Text.Read (readMaybe)
24−import Reflex.Dom.Core hiding (run)
24+import Reflex.Dom.Core hiding (run, mainWidget)
25+import Reflex.Dom (mainWidget)
2526------------------------------------------------------------------------------
2627import Servant.Reflex
2728import Servant.Reflex.Multi
servant-reflex.cabal+1
@@ -61,6 +61,7 @@ executable example
6161 base,
6262 scientific,
6363 servant,
64+ reflex-dom,
6465 reflex-dom-core,
6566 text
6667 default-language: Haskell2010
travis.nix+1
@@ -48,6 +48,7 @@ in
4848 inherit reflexPlatform ghcPkgs ghcjsPkgs;
4949
5050 build = ghcjsPkgs.servant-reflex;
51+ buildGhc = ghcPkgs.servant-reflex;
5152 testserver = ghcPkgs.testserver;
5253 testdriver = ghcPkgs.testdriver;
5354 inherit testresults;