summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-28 14:46:01 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-28 14:46:01 -0400
commit726fdb9352c133cf6dce31c4018e08ab0fa69beb (patch)
treead90d6552f41628e1f5bb243a8d790fec98a7740
parent0ad4c1a8c662521c06cee3d993be9ea3110b8e18 (diff)
remove Inotify build flag
Available for a long time in Linux, and only used there, so a flag is not needed.
-rw-r--r--git-annex.cabal5
-rw-r--r--stack.yaml1
2 files changed, 1 insertions, 5 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index 8cbc762c6..5c09a0c61 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -37,9 +37,6 @@ Flag S3
Flag WebDAV
Description: Enable WebDAV support
-Flag Inotify
- Description: Enable inotify support
-
Flag Assistant
Description: Enable git-annex assistant and watch command
@@ -177,7 +174,7 @@ Executable git-annex
CPP-Options: -DWITH_ASSISTANT
if flag(Assistant)
- if os(linux) && flag(Inotify)
+ if os(linux)
Build-Depends: hinotify
CPP-Options: -DWITH_INOTIFY
else
diff --git a/stack.yaml b/stack.yaml
index 9ff575912..ca65cff89 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -3,7 +3,6 @@ flags:
concurrentoutput: true
tahoe: true
tdfa: true
- inotify: true
feed: true
webapp-secure: true
production: true