Skip to content

Commit 93ffff1

Browse files
committed
Put lower bound on fsnotify, drop confDebounce
1 parent 565897b commit 93ffff1

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

default.nix

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
{ rev ? "7c6985653708c5fade76d2014824ff333b0a07b2"
2-
, overlays ? [ (import ./overlay.nix) ]
3-
, pkgs ?
4-
if ((rev == "") || (rev == "default") || (rev == "local"))
5-
then import <nixpkgs> { inherit overlays; }
6-
# Do not guard with hash, so the project is able to use current channels (rolling `rev`) of Nixpkgs
7-
else import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz") { inherit overlays; }
1+
{ overlays ? [ (import ./overlay.nix) ]
2+
, pkgs ? import <nixpkgs> { inherit overlays; }
83
}:
94

105
let

implicitpipe.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ library
1919
, data-default
2020
, directory
2121
, filepath
22-
, fsnotify
22+
, fsnotify >= 0.4
2323
, GPipe >= 2.2
2424
, GPipe-GLFW >= 1.4
2525
, GLFW-b

overlay.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ in
2222
overrides = super.lib.composeExtensions (old.overrides or (_: _: {}))
2323
(hself: hsuper: {
2424
#GPipe = super.haskell.lib.doJailbreak hsuper.GPipe;
25-
GPipe = hsuper.callCabal2nix "GPipe" "${gpipeSrc}/GPipe-Core" {};
26-
GPipe-GLFW = hsuper.callCabal2nix "GPipe-GLFW" ("${gpipeGlfwSrc}/GPipe-GLFW") {};
25+
GPipe = super.haskell.lib.doJailbreak (hsuper.callCabal2nix "GPipe" "${gpipeSrc}/GPipe-Core" {});
26+
GPipe-GLFW = super.haskell.lib.doJailbreak (hsuper.callCabal2nix "GPipe-GLFW" ("${gpipeGlfwSrc}/GPipe-GLFW") {});
2727

2828
# for development
2929
# implicit = hsuper.callCabal2nix "implicit" (super.fetchFromGitHub {

src/Graphics/Implicit/Viewer/Loaders.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ runUpdater modFileRel initialResolution renderChan = void $ do
5252
eventHandler (FSNotify.Modified fp _ _) = atomically $ writeTChan watchEvent fp
5353
eventHandler _ = return ()
5454

55-
void $ async $ FSNotify.withManagerConf (FSNotify.defaultConfig { FSNotify.confDebounce = FSNotify.Debounce 1 }) $ \mgr -> do
55+
void $ async $ FSNotify.withManagerConf FSNotify.defaultConfig $ \mgr -> do
5656
void $ FSNotify.watchDir
5757
mgr
5858
(System.FilePath.takeDirectory modFile)

0 commit comments

Comments
 (0)