Merge branch 'master' of github.com:dmjio/miso

dmjio · Oct 8, 2017 · 2967745 · 2967745
2 parents 2f43bfb + ee633ac
commit 2967745
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/miso-ghc.nix b/miso-ghc.nix
@@ -1,5 +1,6 @@
-{ mkDerivation, aeson, base, bytestring, containers, lucid
-, stdenv, text, vector, servant, servant-lucid
+{ mkDerivation, aeson, base, bytestring, containers, http-api-data
+, http-types, lucid, network-uri, servant, servant-lucid, stdenv
+, text, transformers, vector
 }:
 mkDerivation {
   pname = "miso";
@@ -8,8 +9,8 @@ mkDerivation {
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
-    aeson base bytestring containers lucid text vector servant
-    servant-lucid
+    aeson base bytestring containers http-api-data http-types lucid
+    network-uri servant servant-lucid text transformers vector
   ];
   homepage = "http://github.com/dmjio/miso";
   description = "A tasty Haskell front-end framework";

diff --git a/miso.cabal b/miso.cabal
@@ -255,6 +255,7 @@ library
     Miso.Event
     Miso.Event.Decoder
     Miso.Event.Types
+    Miso.Router
     Miso.Svg
     Miso.Svg.Attribute
     Miso.Svg.Element
@@ -272,6 +273,9 @@ library
     base < 5,
     bytestring,
     containers,
+    http-api-data,
+    http-types,
+    network-uri,
     servant,
     text,
     transformers
@@ -280,9 +284,6 @@ library
       ghcjs-src
     build-depends:
       ghcjs-base,
-      http-types,
-      network-uri,
-      http-api-data,
       containers,
       scientific,
       unordered-containers,
@@ -299,7 +300,6 @@ library
       Miso.Effect.Storage
       Miso.Effect.XHR
       Miso.Effect.DOM
-      Miso.Router
       Miso.Subscription
       Miso.Subscription.History
       Miso.Subscription.Keyboard

diff --git a/ghcjs-src/Miso/Router.hs → src/Miso/Router.hs b/ghcjs-src/Miso/Router.hs → src/Miso/Router.hs