Commit 5c94631e authored by Andrew Gibiansky's avatar Andrew Gibiansky

Attempting to fix more build issues

parent 8a37d1e6
......@@ -504,7 +504,11 @@ parseStringTests = describe "Parser" $ do
it "breaks without data kinds" $
parses "data X = 3" `like` [
#if MIN_VERSION_ghc(7, 8, 0)
ParseError (Loc 1 10) "Illegal literal in type (use DataKinds to enable): 3"
#else
ParseError (Loc 1 10) "Illegal literal in type (use -XDataKinds to enable): 3"
#endif
]
it "parses statements after imports" $ do
......
......@@ -55,12 +55,12 @@ INSTALL_DIRS=`echo $INSTALLS | tr ' ' '\n' | sed 's#^#./#' | tr ' ' '\n'`
if [ `uname` = Darwin ]; then
cabal install --constraint "arithmoi -llvm" -j $INSTALL_DIRS --force-reinstalls
else
cabal install -j $INSTALL_DIRS --force-reinstalls
cabal install -j $INSTALL_DIRS --force-reinstalls --constraint "arithmoi==0.4.*"
fi
# Finish installing ihaskell-diagrams.
if [ $# -gt 0 ]; then
if [ $1 = "display" ]; then
cabal install -j ihaskell-display/ihaskell-diagrams --force-reinstalls
cabal install -j ihaskell-display/ihaskell-diagrams --force-reinstalls --constraint "arithmoi==0.4.*"
fi
fi
......@@ -95,9 +95,7 @@ library
utf8-string -any,
uuid >=1.3,
vector -any,
ipython-kernel >=0.3,
arithmoi ==0.4.*
-- arithmoi is fixed to avoid issues with diagrams
ipython-kernel >=0.3
if flag(binPkgDb)
build-depends: bin-package-db
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment