git.iko.soy/obelisk
on master help sign in
s/obelisk-run-frontend/obelisk-run/
commitf9f6d36bf064674ec54e74488aeb6ac532b1aa6b authorLuigy Leon <luigy@outlook.com> dateTue 15 May 2018, 20:41 (8 years ago) parent1ceabca
5 files changed+7−7
compare with master
unifiedsplit
default.nix+2−2 lib/command/src/Obelisk/Command/Run.hs+1−1 lib/run-frontend/obelisk-run-frontend.cabal → lib/run/obelisk-run.cabal+2−2 lib/run-frontend/src/Obelisk/Widget/Run.hs → lib/run/src/Obelisk/Run.hs+1−1 skeleton/frontend/frontend.cabal+1−1
default.nix+2−2
@@ -78,7 +78,7 @@ let #TODO: Upstream
7878 obelisk-asset-serve-snap = self.callCabal2nix "obelisk-asset-serve-snap" (hackGet ./lib/asset + "/serve-snap") {};
7979 obelisk-backend = self.callCabal2nix "obelisk-backend" (cleanSource ./lib/backend) {};
8080 obelisk-command = (self.callCabal2nix "obelisk-command" (cleanSource ./lib/command) {}).override { Cabal = super.Cabal_2_0_0_2; };
81− obelisk-run-frontend = self.callCabal2nix "obelisk-run-frontend" (cleanSource ./lib/run-frontend) {};
81+ obelisk-run = self.callCabal2nix "obelisk-run" (cleanSource ./lib/run) {};
8282 obelisk-selftest = self.callCabal2nix "obelisk-selftest" (cleanSource ./lib/selftest) {};
8383 obelisk-snap = self.callCabal2nix "obelisk-snap" (cleanSource ./lib/snap) {};
8484 obelisk-snap-extras = self.callCabal2nix "obelisk-snap-extras" (cleanSource ./lib/snap-extras) {};
@@ -214,7 +214,7 @@ rec {
214214 combinedPackages = predefinedPackages // packages;
215215 projectOverrides = self: super: {
216216 ${staticName} = dontHaddock (self.callCabal2nix "static" assets.haskellManifest {});
217− frontend = if self.ghc.isGhcjs or false then super.frontend.override { obelisk-run-frontend = null; } else super.frontend;
217+ frontend = if self.ghc.isGhcjs or false then super.frontend.override { obelisk-run = null; } else super.frontend;
218218 };
219219 totalOverrides = composeExtensions (composeExtensions defaultHaskellOverrides projectOverrides) overrides;
220220 ghcDevPackages = ["obelisk-run-frontend"];
lib/command/src/Obelisk/Command/Run.hs+1−1
@@ -47,7 +47,7 @@ run = do
4747 , ":set -i" <> intercalate ":" (mconcat hsSrcDirs)
4848 , ":set -XScopedTypeVariables"
4949 , ":add Backend Frontend"
50− , ":module + System.IO Control.Exception Control.Concurrent Obelisk.Widget.Run Frontend Backend"
50+ , ":module + System.IO Control.Exception Control.Concurrent Obelisk.Run Frontend Backend"
5151 ]
5252 testCmd = unlines
5353 [ "let handleBackendErr (_ :: SomeException) = hPutStrLn stderr \"backend stopped; make a change to your code to reload\""
lib/run-frontend/obelisk-run-frontend.cabal → lib/run/obelisk-run.cabalrenamed+2−2
@@ -1,4 +1,4 @@
1−name: obelisk-run-frontend
1+name: obelisk-run
22version: 0.1
33license: BSD3
44build-type: Simple
@@ -24,5 +24,5 @@ library
2424 , warp
2525 , websockets
2626 exposed-modules:
27− Obelisk.Widget.Run
27+ Obelisk.Run
2828 ghc-options: -Wall
lib/run-frontend/src/Obelisk/Widget/Run.hs → lib/run/src/Obelisk/Run.hsrenamed+1−1
@@ -1,7 +1,7 @@
11{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
33{-# LANGUAGE ScopedTypeVariables #-}
4−module Obelisk.Widget.Run where
4+module Obelisk.Run where
55
66import Control.Concurrent
77import Control.Exception
skeleton/frontend/frontend.cabal+1−1
@@ -11,7 +11,7 @@ library
1111 , static
1212 , text
1313 if !impl(ghcjs)
14− build-depends: obelisk-run-frontend
14+ build-depends: obelisk-run
1515
1616 exposed-modules:
1717 Frontend