Merge pull request #3549 from jfdm/fix-safe-bounds

Relax safe bounds, Fixes #3543.
idris-lang · Dec 6, 2016 · 6fc3627 · 6fc3627
2 parents d89f3fa + e59d304
commit 6fc3627
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -66,6 +66,8 @@ before_install:
     fi
 
 install:
+  - which cabal
+  - which ghc
   - cabal --version
   - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
   - if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];

diff --git a/idris.cabal b/idris.cabal
@@ -289,7 +289,6 @@ Library
                 , vector < 0.12
                 , vector-binary-instances < 0.3
                 , zip-archive > 0.2.3.5 && < 0.4
-                , safe == 0.3.9
                 , fsnotify >= 0.2 && < 2.2
                 , async < 2.2
 
@@ -302,6 +301,14 @@ Library
   else
      build-depends: process < 1.5
 
+  -- safe 0.3.10 is having issues with cabal 1.20 and ghc 7.6.3, the
+  -- hvr ghc ppa doesn't provide a new enough cabal library. Temporary
+  -- fix until hvr ghc ppa is fixed or we deprecate support for 7.6.3.
+  if impl(ghc < 7.8.4)
+     build-depends: safe == 0.3.9
+  else
+     build-depends: safe >= 0.3.9
+
   Extensions:     MultiParamTypeClasses
                 , DeriveFoldable
                 , DeriveTraversable