0512dd0 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Make Travis Pass Again

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.

commit0512dd05292699ee196fa5dabac69bf4bd9e860c authorJan de Muijnck-Hughes <jan.deMuijnck-Hughes@glasgow.ac.uk> dateTue 7 Mar 2017, 09:28 (10 years ago) parent94f4148

2 files changed+7−2

compare with master

unifiedsplit

idris.cabal+1−1 src/Idris/Package.hs+6−1

idris.cabal+1−1

@@ -266,7 +266,7 @@ Library

266266 , code-page >= 0.1 && < 0.2

267267 , containers >= 0.5 && < 0.6

268268 , deepseq < 1.5

269− , directory >= 1.2.5.0

269+ , directory >= 1.2.2.0 && < 1.2.3.0 || > 1.2.3.0

270270 , filepath < 1.5

271271 , fingertree >= 0.1 && < 0.2

272272 , haskeline >= 0.7 && < 0.8

src/Idris/Package.hs+6−1

@@ -335,7 +335,12 @@ auditPackage True ipkg = do

335335

336336 getIdrisFiles :: FilePath -> IO [FilePath]

337337 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+

339344 files <- forM contents (findRest dir)

340345 return $ filter (isIdrisFile) (concat files)

341346