Merge pull request #1042 from obsidiansystems/aa/reflex-platform-1.1

dep: reflex-platform -> 1.1.0.0
obsidiansystems · Aug 1, 2023 · 8654870 · 8654870
2 parents 8e942c0 + 579453b
commit 8654870
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 23 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -2,6 +2,10 @@
 
 This project's release branch is `master`. This log is written from the perspective of the release branch: when changes hit `master`, they are considered released.
 
+## Unreleased
+
+* Update reflex-platform to 1.1.0.0
+
 ## v1.1.0.0 - 2023-05-24
 
 * Update reflex-platform to version 1.0.1.0 with GHC 8.10 and updated nixpkgs

diff --git a/dep/ghcid/default.nix b/dep/ghcid/default.nix
diff --git a/dep/ghcid/github.json b/dep/ghcid/github.json
diff --git a/dep/reflex-platform/github.json b/dep/reflex-platform/github.json
@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-platform",
-  "branch": "release/1.0.1.0",
+  "branch": "release/1.1.0.0",
   "private": false,
-  "rev": "50099ce2bca93ef69cea615ec72152b4a7648de4",
-  "sha256": "1ldzf3qznpysf4drkrvj7ysmdvrv6ddprnniylvcxccpp0f4krb7"
+  "rev": "4aa4e254d5f6134dcf700a55c4c065376f7061da",
+  "sha256": "1flwgp76j5v1m4fbdnk5psnpzx2m1vika6lylvs9l9x6krwbv7d6"
 }
diff --git a/haskell-overlays/misc-deps.nix b/haskell-overlays/misc-deps.nix
@@ -66,7 +66,6 @@ rec {
   nix-derivation = haskellLib.doJailbreak super.nix-derivation;
   algebraic-graphs = haskellLib.doJailbreak super.algebraic-graphs;
   snap = haskellLib.doJailbreak super.snap;
-  ghcid = self.callCabal2nix "ghcid" (hackGet ../dep/ghcid) { };
 
   snap-core = self.callHackage "snap-core" "1.0.5.0" {};
   snap-server = haskellLib.doJailbreak super.snap-server;
@@ -108,5 +107,6 @@ rec {
   semialign-indexed = haskellLib.doJailbreak super.semialign-indexed;
   cborg = haskellLib.dontCheck super.cborg;
   github = self.callHackage "github" "0.28" {};
+  http2 = haskellLib.dontCheck super.http2;
   http-streams = haskellLib.dontCheck super.http-streams;
 }
diff --git a/lib/command/src/Obelisk/Command/Project.hs b/lib/command/src/Obelisk/Command/Project.hs
@@ -56,8 +56,8 @@ import System.Directory
 import System.Environment (lookupEnv)
 import System.Exit (ExitCode(..))
 import System.FilePath
-import System.FSNotify (defaultConfig, eventPath, WatchConfig(..))
-import qualified System.Info as SysInfo
+import System.FSNotify (defaultConfig, eventPath, WatchConfig(..), WatchMode(..))
+import qualified System.Info as Sys
 import System.IO.Temp
 import System.IO.Unsafe (unsafePerformIO)
 import System.PosixCompat.Files
@@ -459,9 +459,11 @@ watchStaticFilesDerivation root = do
         cfg = defaultConfig
           -- On macOS, use the polling backend due to
           -- https://github.com/luite/hfsevents/issues/13
-          { confUsePolling = SysInfo.os == "darwin"
-          , confPollInterval = 250000
-          }
+            { confWatchMode =
+                if Sys.os == "darwin"
+                  then WatchModePoll 250000
+                  else WatchModeOS
+            }
         watch' pkg = fmap (:[]) <$> watchDirectoryTree cfg (root </> pkg <$ pb) (filterEvents . eventPath)
     rebuild <- batchOccurrences 0.25 =<< mergeWith (<>) <$> mapM watch'
       [ "frontend"