git.iko.soy/Idris-dev
on master help sign in
Merge pull request #3549 from jfdm/fix-safe-bounds

Relax safe bounds, Fixes #3543.

commit6fc3627f7a85511eeae210d07a074208451065be authorJan de Muijnck-Hughes <jfdm@users.noreply.github.com> dateTue 6 Dec 2016, 11:20 (10 years ago) parentd89f3fae59d304
2 files changed+10−1
compare with master
unifiedsplit
.travis.yml+2 idris.cabal+8−1
.travis.yml+2
@@ -66,6 +66,8 @@ before_install:
6666 fi
6767
6868install:
69+ - which cabal
70+ - which ghc
6971 - cabal --version
7072 - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
7173 - if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];
idris.cabal+8−1
@@ -289,7 +289,6 @@ Library
289289 , vector < 0.12
290290 , vector-binary-instances < 0.3
291291 , zip-archive > 0.2.3.5 && < 0.4
292− , safe == 0.3.9
293292 , fsnotify >= 0.2 && < 2.2
294293 , async < 2.2
295294
@@ -302,6 +301,14 @@ Library
302301 else
303302 build-depends: process < 1.5
304303
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+
305312 Extensions: MultiParamTypeClasses
306313 , DeriveFoldable
307314 , DeriveTraversable