git.iko.soy/Idris-dev
on master help sign in
Merge pull request #3549 from jfdm/fix-safe-bounds
6fc3627Jan de Muijnck-Hughes
.travis.yml+2
compare with master
unifiedsplit
@@ -66,6 +66,8 @@ before_install:
66 fi
66 fi
67
67
68install:
68install:
69+ - which cabal
70+ - which ghc
69 - cabal --version
71 - cabal --version
70 - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
72 - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
71 - if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];
73 - if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];
idris.cabal+8−1
@@ -289,7 +289,6 @@ Library
289 , vector < 0.12
289 , vector < 0.12
290 , vector-binary-instances < 0.3
290 , vector-binary-instances < 0.3
291 , zip-archive > 0.2.3.5 && < 0.4
291 , zip-archive > 0.2.3.5 && < 0.4
292− , safe == 0.3.9
293 , fsnotify >= 0.2 && < 2.2
292 , fsnotify >= 0.2 && < 2.2
294 , async < 2.2
293 , async < 2.2
295
294
@@ -302,6 +301,14 @@ Library
302 else
301 else
303 build-depends: process < 1.5
302 build-depends: process < 1.5
304
303
304+ -- safe 0.3.10 is having issues with cabal 1.20 and ghc 7.6.3, the
305+ -- hvr ghc ppa doesn't provide a new enough cabal library. Temporary
306+ -- fix until hvr ghc ppa is fixed or we deprecate support for 7.6.3.
307+ if impl(ghc < 7.8.4)
308+ build-depends: safe == 0.3.9
309+ else
310+ build-depends: safe >= 0.3.9
311+
305 Extensions: MultiParamTypeClasses
312 Extensions: MultiParamTypeClasses
306 , DeriveFoldable
313 , DeriveFoldable
307 , DeriveTraversable
314 , DeriveTraversable