Commit 831bf1be authored by Andrew Gibiansky's avatar Andrew Gibiansky

Fix some build issues

parent 9be21579
......@@ -69,7 +69,7 @@ done
INSTALL_DIRS=`echo $INSTALLS | tr ' ' '\n' | sed 's#^#./#' | tr ' ' '\n'`
echo CMD: cabal install --constraint "arithmoi -llvm" -j $INSTALL_DIRS --force-reinstalls --max-backjumps=-1 --reorder-goals
cabal install --constraint "arithmoi -llvm" -j $INSTALL_DIRS --force-reinstalls --max-backjumps=-1 --reorder-goals
cabal install --constraint "arithmoi -llvm" -j $INSTALL_DIRS --force-reinstalls --max-backjumps=-1 --reorder-goals
if hash ihaskell 2>/dev/null; then
ihaskell install 2>/dev/null || echo "The command \"ihaskell install\" failed. Please check your 'ipython --version'. 3.0 or up is required but it is $(ipython --version)!"
......
......@@ -37,7 +37,7 @@ chartData renderable format = do
mkFile opts filename renderable
-- Convert to base64.
imgData <- readFile filename
imgData <- fmap Char.pack $ readFile filename
return $
case format of
PNG -> png width height $ base64 imgData
......
......@@ -56,10 +56,10 @@ defaultKernelSpecOptions = KernelSpecOptions
}
-- | The IPython kernel name.
kernelName :: IsString a => a
kernelName :: String
kernelName = "haskell"
kernelArgs :: IsString a => [a]
kernelArgs :: [String]
kernelArgs = ["--kernel", kernelName]
-- | Run the IPython command with any arguments. The kernel is set to IHaskell.
......@@ -192,7 +192,7 @@ kernelSpecCreated = do
Just ipython <- SH.which "ipython"
out <- SH.silently $ SH.run ipython ["kernelspec", "list"]
let kernelspecs = map T.strip $ T.lines out
return $ kernelName `elem` kernelspecs
return $ T.pack kernelName `elem` kernelspecs
-- | Replace "~" with $HOME if $HOME is defined. Otherwise, do nothing.
subHome :: String -> IO String
......
......@@ -77,7 +77,11 @@ import GHC.Show as X
import GHC.Enum as X
import GHC.Num as X
import GHC.Real as X
#if MIN_VERSION_ghc(7,10,0)
import GHC.Base as X hiding (Any, mapM, foldr, sequence)
#else
import GHC.Base as X hiding (Any)
#endif
import Data.List as X hiding (head, last, tail, init, transpose, subsequences, permutations,
foldl, foldl1, maximum, minimum, scanl, scanl1, scanr, scanr1,
span, break, mapAccumL, mapAccumR, dropWhileEnd, (!!),
......
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