From ea00ff129f916a51996c40321c11eb8fdedb5e8e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 Feb 2013 16:08:03 +0100 Subject: [PATCH 1/5] git-annex.cabal: specify '-DWITH_GLOB' in cpp-options, not ghc-options --- git-annex.cabal | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-annex.cabal b/git-annex.cabal index b588a13216..d62f0a40de 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -132,7 +132,8 @@ Test-Suite test Include-Dirs: Utility C-Sources: Utility/libdiskfree.c Extensions: CPP - GHC-Options: -threaded -DWITH_GLOB + GHC-Options: -threaded + CPP-Options: -DWITH_GLOB source-repository head type: git From 41fcb607dff37f3ad5a9cc40e7734971c7c6ddeb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 Feb 2013 16:08:23 +0100 Subject: [PATCH 2/5] git-annex.cabal: add missing 'random' and 'uuid' dependencies to the test suite --- git-annex.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-annex.cabal b/git-annex.cabal index d62f0a40de..5fbc49a4fa 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -127,7 +127,7 @@ Test-Suite test old-locale, time, extensible-exceptions, dataenc, SHA, process, json, base (>= 4.5 && < 4.7), monad-control, transformers-base, lifted-base, IfElse, text, QuickCheck >= 2.1, - bloomfilter, edit-distance, process, SafeSemaphore, Glob + bloomfilter, edit-distance, process, SafeSemaphore, Glob, random, uuid Other-Modules: Utility.Touch Include-Dirs: Utility C-Sources: Utility/libdiskfree.c From fbc04feb5339ba2eeebdf3d13d9ea85a409b209d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 Feb 2013 16:08:34 +0100 Subject: [PATCH 3/5] git-annex.cabal: strip trailing whitespace --- git-annex.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-annex.cabal b/git-annex.cabal index 5fbc49a4fa..6bfb8a06e2 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -76,7 +76,7 @@ Executable git-annex if flag(WebDAV) Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types CPP-Options: -DWITH_WEBDAV - + if flag(Assistant) Build-Depends: async From d74509da86ccde07daa893e237159948f25b2972 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 Feb 2013 13:07:10 +0100 Subject: [PATCH 4/5] Utility/Path.hs: System.Path is exported by "MissingH" and "pathtype" package --- Utility/Path.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Utility/Path.hs b/Utility/Path.hs index ba836d9b66..d058082df5 100644 --- a/Utility/Path.hs +++ b/Utility/Path.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE PackageImports #-} {- path manipulation - - Copyright 2010-2011 Joey Hess @@ -8,7 +9,7 @@ module Utility.Path where import Data.String.Utils -import System.Path +import "MissingH" System.Path import System.FilePath import System.Directory import Data.List From fbcdfdc6dae42fa2c0a884c588927390adde834d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 Feb 2013 13:07:28 +0100 Subject: [PATCH 5/5] Common.hs: System.Path is exported by "MissingH" and "pathtype" package --- Common.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common.hs b/Common.hs index 5b53f37352..3513425c0a 100644 --- a/Common.hs +++ b/Common.hs @@ -12,7 +12,7 @@ import Data.Maybe as X import Data.List as X hiding (head, tail, init, last) import Data.String.Utils as X -import System.Path as X +import "MissingH" System.Path as X import System.FilePath as X import System.Directory as X import System.IO as X hiding (FilePath)