From dbc00906bfe601288fdc78a1c6e5dda7bc2c3577 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Mar 2025 10:17:03 -0400 Subject: [PATCH] Fix build without the assistant. --- CHANGELOG | 1 + Utility/DirWatcher.hs | 2 +- .../10.20250320_build_error_when_assistant_is_disabled.mdwn | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 624d23dfd6..eea3df362a 100644 --- 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 Fri, 21 Mar 2025 12:27:11 -0400 diff --git a/Utility/DirWatcher.hs b/Utility/DirWatcher.hs index d7573d7475..f6ec79e6aa 100644 --- 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 6b3837aed5..641a71ca54 100644 --- 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 . + +> [[fixed|done]] --[[Joey]]