Merge branch 'update-cabal-build' of https://github.com/peti/git-annex

This commit is contained in:
Joey Hess 2013-02-23 12:49:00 -04:00
commit c32ab298b1
3 changed files with 7 additions and 5 deletions

View file

@ -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)

View file

@ -1,3 +1,4 @@
{-# LANGUAGE PackageImports #-}
{- path manipulation
-
- Copyright 2010-2011 Joey Hess <joey@kitenet.net>
@ -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

View file

@ -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
@ -127,12 +127,13 @@ 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
Extensions: CPP
GHC-Options: -threaded -DWITH_GLOB
GHC-Options: -threaded
CPP-Options: -DWITH_GLOB
source-repository head
type: git