f9f6d36 · obelisk · git.iko.soy

default.nix+2−2

@@ -78,7 +78,7 @@ let #TODO: Upstream

78 obelisk-asset-serve-snap = self.callCabal2nix "obelisk-asset-serve-snap" (hackGet ./lib/asset + "/serve-snap") {};

79 obelisk-backend = self.callCabal2nix "obelisk-backend" (cleanSource ./lib/backend) {};

80 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) {};

82 obelisk-selftest = self.callCabal2nix "obelisk-selftest" (cleanSource ./lib/selftest) {};

83 obelisk-snap = self.callCabal2nix "obelisk-snap" (cleanSource ./lib/snap) {};

84 obelisk-snap-extras = self.callCabal2nix "obelisk-snap-extras" (cleanSource ./lib/snap-extras) {};

@@ -214,7 +214,7 @@ rec {

214 combinedPackages = predefinedPackages // packages;

215 projectOverrides = self: super: {

216 ${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;

218 };

219 totalOverrides = composeExtensions (composeExtensions defaultHaskellOverrides projectOverrides) overrides;

220 ghcDevPackages = ["obelisk-run-frontend"];

lib/command/src/Obelisk/Command/Run.hs+1−1

@@ -47,7 +47,7 @@ run = do

47 , ":set -i" <> intercalate ":" (mconcat hsSrcDirs)

48 , ":set -XScopedTypeVariables"

49 , ":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"

51 ]

52 testCmd = unlines

53 [ "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

2version: 0.1

3license: BSD3

4build-type: Simple

@@ -24,5 +24,5 @@ library

24 , warp

25 , websockets

26 exposed-modules:

27− Obelisk.Widget.Run

27+ Obelisk.Run

28 ghc-options: -Wall

lib/run-frontend/src/Obelisk/Widget/Run.hs → lib/run/src/Obelisk/Run.hsrenamed+1−1

@@ -1,7 +1,7 @@

1{-# LANGUAGE LambdaCase #-}

2{-# LANGUAGE OverloadedStrings #-}

3{-# LANGUAGE ScopedTypeVariables #-}

4−module Obelisk.Widget.Run where

4+module Obelisk.Run where

5

6import Control.Concurrent

7import Control.Exception

skeleton/frontend/frontend.cabal+1−1

@@ -11,7 +11,7 @@ library

11 , static

12 , text

13 if !impl(ghcjs)

14− build-depends: obelisk-run-frontend

14+ build-depends: obelisk-run

15

16 exposed-modules:

17 Frontend