git.iko.soy/Idris-dev
on master help sign in
Make Travis Pass Again
0512dd0Jan de Muijnck-Hughes
idris.cabal+1−1
compare with master
unifiedsplit
@@ -266,7 +266,7 @@ Library
266 , code-page >= 0.1 && < 0.2
266 , code-page >= 0.1 && < 0.2
267 , containers >= 0.5 && < 0.6
267 , containers >= 0.5 && < 0.6
268 , deepseq < 1.5
268 , deepseq < 1.5
269− , directory >= 1.2.5.0
269+ , directory >= 1.2.2.0 && < 1.2.3.0 || > 1.2.3.0
270 , filepath < 1.5
270 , filepath < 1.5
271 , fingertree >= 0.1 && < 0.2
271 , fingertree >= 0.1 && < 0.2
272 , haskeline >= 0.7 && < 0.8
272 , haskeline >= 0.7 && < 0.8
src/Idris/Package.hs+6−1
@@ -335,7 +335,12 @@ auditPackage True ipkg = do
335
335
336 getIdrisFiles :: FilePath -> IO [FilePath]
336 getIdrisFiles :: FilePath -> IO [FilePath]
337 getIdrisFiles dir = do
337 getIdrisFiles dir = do
338− contents <- listDirectory dir
338+ contents <- getDirectoryContents dir
339+ let contents' = filter (\fname -> fname /= "." && fname /= "..") contents
340+
341+ -- [ NOTE ] Directory >= 1.2.5.0 introduced `listDirectory` but later versions of directory appear to be causing problems with ghc 7.10.3 and cabal 1.22 in travis. Let's reintroduce the old ranges for directory to be sure.
342+
343+
339 files <- forM contents (findRest dir)
344 files <- forM contents (findRest dir)
340 return $ filter (isIdrisFile) (concat files)
345 return $ filter (isIdrisFile) (concat files)
341
346