afc1ede · obelisk · git.iko.soy

git.iko.soy/obelisk

Merge remote-tracking branch 'origin/develop' into eac@update-rp-0.6.0.0

commitafc1ede54d39bc495b63b6d3f7a77e180ec47b24 author3noch <eacameron@gmail.com> dateThu 9 Jul 2020, 10:45 (6 years ago) parenta048a73 989641f

6 files changed+48−26

compare with master

unifiedsplit

lib/backend/obelisk-backend.cabal+1−1 lib/backend/src/Obelisk/Backend.hs+1−1 lib/executable-config/default.nix+13−2 lib/executable-config/lookup/obelisk-executable-config-lookup.cabal+8−7 lib/executable-config/lookup/src/Obelisk/Configs.hs+24−14 lib/run/obelisk-run.cabal+1−1

lib/backend/obelisk-backend.cabal+1−1

@@ -21,7 +21,7 @@ library

2121 obelisk-frontend,

2222 obelisk-route,

2323 obelisk-snap-extras,

24− reflex-dom,

24+ reflex-dom-core,

2525 snap,

2626 snap-server,

2727 text,

lib/backend/src/Obelisk/Backend.hs+1−1

@@ -58,7 +58,7 @@ import qualified Obelisk.ExecutableConfig.Lookup as Lookup

5858import Obelisk.Frontend

5959import Obelisk.Route

6060import Obelisk.Snap.Extras (doNotCache, serveFileIfExistsAs)

61−import Reflex.Dom

61+import Reflex.Dom.Core

6262import Snap (MonadSnap, Snap, commandLineConfig, defaultConfig, getsRequest, httpServe, modifyResponse

6363 , rqPathInfo, rqQueryString, setContentType, writeBS, writeText

6464 , rqCookies, Cookie(..) , setHeader)

lib/executable-config/default.nix+13−2

@@ -25,8 +25,19 @@ let

2525in

2626

2727{

28− haskellOverlay = self: super: {

29− obelisk-executable-config-lookup = self.callCabal2nix "obelisk-executable-config-lookup" (obeliskCleanSource ./lookup) {};

28+ haskellOverlay = self: super:

29+ let

30+ pkgs = self.callPackage ({pkgs}: pkgs) {};

31+ in {

32+ obelisk-executable-config-lookup = pkgs.haskell.lib.overrideCabal

33+ (self.callCabal2nix "obelisk-executable-config-lookup" (obeliskCleanSource ./lookup) {})

34+ (drv: {

35+ # Hack until https://github.com/NixOS/cabal2nix/pull/432 lands

36+ libraryHaskellDepends = (drv.libraryHaskellDepends or [])

37+ ++ pkgs.stdenv.lib.optionals (with pkgs.stdenv.hostPlatform; isAndroid && is32bit) [

38+ self.android-activity

39+ ];

40+ });

3041 };

3142

3243 platforms = {

lib/executable-config/lookup/obelisk-executable-config-lookup.cabal+8−7

@@ -33,15 +33,16 @@ library

3333 containers,

3434 exceptions,

3535 filepath,

36− text,

37− transformers,

38− transformers-base,

39− ref-tf,

40− primitive,

36+ jsaddle,

4137 mmorph,

4238 monad-control,

39+ mtl,

40+ primitive,

41+ ref-tf,

42+ reflex-dom-core,

4343 reflex,

44− reflex-dom,

45− jsaddle

44+ text,

45+ transformers-base,

46+ transformers

4647

4748 ghc-options: -Wall

lib/executable-config/lookup/src/Obelisk/Configs.hs+24−14

@@ -18,18 +18,19 @@ module Obelisk.Configs

1818 , getTextConfig

1919 ) where

2020

21−import Control.Applicative

22−import Control.Monad

23−import Control.Monad.Catch

24−import Control.Monad.Base

25−import Control.Monad.Fix

26−import Control.Monad.Morph

27−import Control.Monad.Primitive

28−import Control.Monad.Ref

29−import Control.Monad.IO.Class

30−import Control.Monad.Trans.Control

31−import Control.Monad.Trans.Reader

32−import Control.Monad.Trans.State

21+import Control.Applicative (Alternative)

22+import Control.Monad (MonadPlus)

23+import Control.Monad.Base (MonadBase)

24+import Control.Monad.Catch (MonadThrow)

25+import Control.Monad.Fix (MonadFix)

26+import Control.Monad.IO.Class (MonadIO)

27+import Control.Monad.Morph (MFunctor)

28+import Control.Monad.Primitive (PrimMonad, PrimState, primitive)

29+import Control.Monad.Ref (MonadRef)

30+import Control.Monad.Trans (MonadTrans, lift)

31+import Control.Monad.Trans.Control (MonadBaseControl)

32+import Control.Monad.Trans.Reader (ReaderT (..), ask, mapReaderT)

33+import Control.Monad.Trans.State (StateT)

3334import qualified Control.Monad.Trans.State.Strict as Strict

3435import Data.ByteString (ByteString)

3536import Data.Map (Map)

@@ -37,8 +38,17 @@ import qualified Data.Map as Map

3738import Data.Text (Text)

3839import qualified Data.Text.Encoding as T

3940import Reflex

40−import Reflex.Host.Class

41−import Reflex.Dom

41+import Reflex.Host.Class (MonadReflexCreateTrigger)

42+import Reflex.Dom.Core

43+ ( DomBuilder

44+ , DomRenderHook

45+ , HasDocument

46+ , HasJS

47+ , HasJSContext

48+ , Prerender (Client)

49+ , StaticDomBuilderT

50+ , prerender

51+ )

4252#ifndef ghcjs_HOST_OS

4353import Language.Javascript.JSaddle (MonadJSM)

4454#endif

lib/run/obelisk-run.cabal+1−1

@@ -33,7 +33,7 @@ library

3333 , process

3434 , ref-tf

3535 , reflex

36− , reflex-dom

36+ , reflex-dom-core

3737 , snap-core

3838 , streaming-commons

3939 , text