git.iko.soy/obelisk
on master help sign in
Merge pull request #853 from obsidiansystems/aa/reflex-0.8.1.0
8fd67f5Ali Abrar
ChangeLog.md+1
compare with master
unifiedsplit
@@ -4,6 +4,7 @@ This project's release branch is `master`. This log is written from the perspect
4
4
5## Unreleased
5## Unreleased
6
6
7+* Update reflex-platform to v0.7.1.0
7* Fix bug [#790](https://github.com/obsidiansystems/obelisk/issues/790) which prevented CSS file loading on ios
8* Fix bug [#790](https://github.com/obsidiansystems/obelisk/issues/790) which prevented CSS file loading on ios
8* Use TemplateHaskell to determine asset file paths
9* Use TemplateHaskell to determine asset file paths
9 * Migration: All uses of `static @"some/path"` become `$(static "some/path")`. Instead of requiring `TypeApplications` and `DataKinds`, modules calling `static` must now enable `TemplateHaskell`.
10 * Migration: All uses of `static @"some/path"` become `$(static "some/path")`. Instead of requiring `TypeApplications` and `DataKinds`, modules calling `static` must now enable `TemplateHaskell`.
dep/logging-effect/default.nixnew file+2
@@ -0,0 +1,2 @@
1+# DO NOT HAND-EDIT THIS FILE
2+import (import ./thunk.nix)
dep/logging-effect/github.jsonnew file+7
@@ -0,0 +1,7 @@
1+{
2+ "owner": "ocharles",
3+ "repo": "logging-effect",
4+ "private": false,
5+ "rev": "efc856b62aec15f0087be0edb7ba621ed49b0bb1",
6+ "sha256": "13nr3zw39415js1af2vd322vhzwqb2rkrv7b5lkd97h211d7zbj9"
7+}
dep/logging-effect/thunk.nixnew file+9
@@ -0,0 +1,9 @@
1+# DO NOT HAND-EDIT THIS FILE
2+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+ if !fetchSubmodules && !private then builtins.fetchTarball {
4+ url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+ } else (import <nixpkgs> {}).fetchFromGitHub {
6+ inherit owner repo rev sha256 fetchSubmodules private;
7+ };
8+ json = builtins.fromJSON (builtins.readFile ./github.json);
9+in fetch json
dep/reflex-platform/github.json+3−3
@@ -1,8 +1,8 @@
1{
1{
2 "owner": "reflex-frp",
2 "owner": "reflex-frp",
3 "repo": "reflex-platform",
3 "repo": "reflex-platform",
4− "branch": "release/0.7.0.0",
4+ "branch": "release/0.7.1.0",
5 "private": false,
5 "private": false,
6− "rev": "27a7851a780ff21472d85f9a02fb84635ef9027a",
6+ "rev": "95ab759c0f12b10d0d012e5a7762321c80e721e4",
7− "sha256": "1m4zlw91dpjlbdchjyxhvhv3k7lilm0qa17dhhww868xxc27sann"
7+ "sha256": "1k99nadp3m4xjzl52pm39ijkd6nw634dhy8m0rvn49cv20431gpi"
8}
8}
haskell-overlays/misc-deps.nix+7−2
@@ -13,8 +13,9 @@ in
13 regex-posix = self.callHackage "regex-posix" "0.96.0.0" {};
13 regex-posix = self.callHackage "regex-posix" "0.96.0.0" {};
14 regex-tdfa = self.callHackage "regex-tdfa" "1.3.1.0" {};
14 regex-tdfa = self.callHackage "regex-tdfa" "1.3.1.0" {};
15 test-framework = haskellLib.dontCheck (self.callHackage "test-framework" "0.8.2.0" {});
15 test-framework = haskellLib.dontCheck (self.callHackage "test-framework" "0.8.2.0" {});
16− hnix = haskellLib.dontCheck (self.callHackage "hnix" "0.8.0" {});
16+ hnix = haskellLib.dontCheck super.hnix;
17− hnix-store-core = self.callHackage "hnix-store-core" "0.2.0.0" {};
17+ hnix-store-core = haskellLib.dontCheck super.hnix-store-core;
18+ hnix-store = haskellLib.dontCheck super.hnix-store;
18
19
19 aeson-gadt-th = self.callHackage "aeson-gadt-th" "0.2.4" {};
20 aeson-gadt-th = self.callHackage "aeson-gadt-th" "0.2.4" {};
20
21
@@ -22,5 +23,9 @@ in
22 # Exports more internals
23 # Exports more internals
23 snap-core = haskellLib.dontCheck (self.callCabal2nix "snap-core" (hackGet ../dep/snap-core) {});
24 snap-core = haskellLib.dontCheck (self.callCabal2nix "snap-core" (hackGet ../dep/snap-core) {});
24
25
26+ logging-effect = self.callCabal2nix "logging-effect" (hackGet ../dep/logging-effect) {};
27+ resourcet = self.callHackage "resourcet" "1.2.4.2" {};
28+ unliftio-core = self.callHackage "unliftio-core" "0.2.0.1" {};
25 shelly = self.callHackage "shelly" "1.9.0" {};
29 shelly = self.callHackage "shelly" "1.9.0" {};
30+ monad-logger = self.callHackage "monad-logger" "0.3.36" {};
26}
31}
lib/cliapp/src/Obelisk/CliApp/Types.hs−2
@@ -47,8 +47,6 @@ type CliThrow e m = MonadError e m
47putLog :: CliLog m => Severity -> Text -> m ()
47putLog :: CliLog m => Severity -> Text -> m ()
48putLog sev = logMessage . Output_Log . WithSeverity sev
48putLog sev = logMessage . Output_Log . WithSeverity sev
49
49
50−deriving instance MonadFail m => MonadFail (LoggingT Output m)
51−
52newtype DieT e m a = DieT { unDieT :: ReaderT (e -> (Text, Int)) (LoggingT Output m) a }
50newtype DieT e m a = DieT { unDieT :: ReaderT (e -> (Text, Int)) (LoggingT Output m) a }
53 deriving
51 deriving
54 ( Functor, Applicative, Monad, MonadIO, MonadFail
52 ( Functor, Applicative, Monad, MonadIO, MonadFail