Fix build without the assistant.

diff --git a/CHANGELOG b/CHANGELOG
index 624d23dfd665f5973ace362c958df78fd720c66e..eea3df362a1462358d47588957cc80be3ad03a67 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ git-annex (10.20250321) UNRELEASED; urgency=medium
   * updatecluster, updateproxy: When a remote that has no annex-uuid is
     configured as annex-cluster-node, warn and avoid writing bad data to
     the git-annex branch.
+  * Fix build without the assistant.
 
  -- Joey Hess <id@joeyh.name>  Fri, 21 Mar 2025 12:27:11 -0400
 

diff --git a/Utility/DirWatcher.hs b/Utility/DirWatcher.hs
index d7573d747591250fa5b0d9bcb1635b002dfb1e03..f6ec79e6aa8eda7b617016601e310f456c5d6e1b 100644 (file)
--- a/Utility/DirWatcher.hs
+++ b/Utility/DirWatcher.hs
@@ -139,7 +139,7 @@ watchDir dir prune scanevents hooks runstartup =
        runstartup $ Win32Notify.watchDir dir prune scanevents hooks
 #else
 type DirWatcherHandle = ()
-watchDir :: FilePath -> Pruner -> Bool -> WatchHooks -> (IO () -> IO ()) -> IO DirWatcherHandle
+watchDir :: OsPath -> Pruner -> Bool -> WatchHooks -> (IO () -> IO ()) -> IO DirWatcherHandle
 watchDir = error "watchDir not defined"
 #endif
 #endif

diff --git a/doc/bugs/10.20250320_build_error_when_assistant_is_disabled.mdwn b/doc/bugs/10.20250320_build_error_when_assistant_is_disabled.mdwn
index 6b3837aed5d1c28b6e34b86840e6930e00abbfd7..641a71ca5458d954e4a987cbe3885d11a91d5a25 100644 (file)
--- a/doc/bugs/10.20250320_build_error_when_assistant_is_disabled.mdwn
+++ b/doc/bugs/10.20250320_build_error_when_assistant_is_disabled.mdwn
@@ -60,3 +60,5 @@ of the setup in case they turn out to be relevant:
    - `--ghc-options="-j$n +RTS -A256m -RTS -split-sections -optc-Os -optl=-pthread"`
 
    Full setup is at <https://git.kyleam.com/static-annex/>.
+
+> [[fixed|done]] --[[Joey]]