From bbdfdaa83340090451e0eeabccc4d8651cb68324 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 18 Feb 2018 11:09:16 -0400 Subject: [PATCH] git-annex.cabal: Once more try to not build the assistant on the hurd, hopefully hackage finally recognises that OS. Last try was in 2015 https://github.com/haskell/hackage-server/issues/269 --- CHANGELOG | 2 ++ git-annex.cabal | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 3ce76debb6..dba74a8ecc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,8 @@ git-annex (6.20180113) UNRELEASED; urgency=medium * --json: When there are multiple lines of notes about a file, make the note field multiline, rather than the old behavior of only including the last line. + * git-annex.cabal: Once more try to not build the assistant on the hurd, + hopefully hackage finally recognises that OS. -- Joey Hess Wed, 24 Jan 2018 20:42:55 -0400 diff --git a/git-annex.cabal b/git-annex.cabal index d934212257..446695fc8a 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -411,7 +411,7 @@ Executable git-annex Remote.WebDAV Remote.WebDAV.DavLocation - if flag(Assistant) && ! os(solaris) + if flag(Assistant) && ! os(solaris) && ! os(gnu) Build-Depends: dns (>= 1.0.0), mountpoints CPP-Options: -DWITH_ASSISTANT @@ -431,7 +431,7 @@ Executable git-annex CPP-Options: -DWITH_WIN32NOTIFY Other-Modules: Utility.DirWatcher.Win32Notify else - if (! os(solaris) && ! os(linux)) + if (! os(solaris) && ! os(gnu) && ! os(linux)) CPP-Options: -DWITH_KQUEUE C-Sources: Utility/libkqueue.c Includes: Utility/libkqueue.h