diff --git a/default.nix b/default.nix index d796be9..25c64e6 100644 --- a/default.nix +++ b/default.nix @@ -1,10 +1,5 @@ -{ rev ? "7c6985653708c5fade76d2014824ff333b0a07b2" -, overlays ? [ (import ./overlay.nix) ] -, pkgs ? - if ((rev == "") || (rev == "default") || (rev == "local")) - then import { inherit overlays; } - # Do not guard with hash, so the project is able to use current channels (rolling `rev`) of Nixpkgs - else import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz") { inherit overlays; } +{ overlays ? [ (import ./overlay.nix) ] +, pkgs ? import { inherit overlays; } }: let diff --git a/implicitpipe.cabal b/implicitpipe.cabal index 9f78271..1fde21a 100644 --- a/implicitpipe.cabal +++ b/implicitpipe.cabal @@ -19,7 +19,7 @@ library , data-default , directory , filepath - , fsnotify + , fsnotify >= 0.4 , GPipe >= 2.2 , GPipe-GLFW >= 1.4 , GLFW-b diff --git a/overlay.nix b/overlay.nix index 40409c0..8a933f1 100644 --- a/overlay.nix +++ b/overlay.nix @@ -22,8 +22,8 @@ in overrides = super.lib.composeExtensions (old.overrides or (_: _: {})) (hself: hsuper: { #GPipe = super.haskell.lib.doJailbreak hsuper.GPipe; - GPipe = hsuper.callCabal2nix "GPipe" "${gpipeSrc}/GPipe-Core" {}; - GPipe-GLFW = hsuper.callCabal2nix "GPipe-GLFW" ("${gpipeGlfwSrc}/GPipe-GLFW") {}; + GPipe = super.haskell.lib.doJailbreak (hsuper.callCabal2nix "GPipe" "${gpipeSrc}/GPipe-Core" {}); + GPipe-GLFW = super.haskell.lib.doJailbreak (hsuper.callCabal2nix "GPipe-GLFW" ("${gpipeGlfwSrc}/GPipe-GLFW") {}); # for development # implicit = hsuper.callCabal2nix "implicit" (super.fetchFromGitHub { diff --git a/src/Graphics/Implicit/Viewer/Loaders.hs b/src/Graphics/Implicit/Viewer/Loaders.hs index 0ce314d..eb26911 100644 --- a/src/Graphics/Implicit/Viewer/Loaders.hs +++ b/src/Graphics/Implicit/Viewer/Loaders.hs @@ -52,7 +52,7 @@ runUpdater modFileRel initialResolution renderChan = void $ do eventHandler (FSNotify.Modified fp _ _) = atomically $ writeTChan watchEvent fp eventHandler _ = return () - void $ async $ FSNotify.withManagerConf (FSNotify.defaultConfig { FSNotify.confDebounce = FSNotify.Debounce 1 }) $ \mgr -> do + void $ async $ FSNotify.withManagerConf FSNotify.defaultConfig $ \mgr -> do void $ FSNotify.watchDir mgr (System.FilePath.takeDirectory modFile)