diff --git a/ihaskell-display/ihaskell-charts/IHaskell/Display/Charts.hs b/ihaskell-display/ihaskell-charts/IHaskell/Display/Charts.hs
index 9455852e077df6525408afd9b04a89874a286b52..eec075c379079ab7269d4e4373bcacf6d3ad098a 100644
--- a/ihaskell-display/ihaskell-charts/IHaskell/Display/Charts.hs
+++ b/ihaskell-display/ihaskell-charts/IHaskell/Display/Charts.hs
@@ -39,7 +39,7 @@ chartData renderable format = do
mkFile opts filename renderable
-- Convert to base64.
- imgData <- readFile $ fpFromString filename
+ imgData <- readFile filename
return $
case format of
PNG -> png width height $ base64 imgData
diff --git a/ihaskell-display/ihaskell-charts/ihaskell-charts.cabal b/ihaskell-display/ihaskell-charts/ihaskell-charts.cabal
index bf75bebf69d70f59486739b0d35c088a0fd91d3e..5381e14b278accd62de7161b08669a721399bf6e 100644
--- a/ihaskell-display/ihaskell-charts/ihaskell-charts.cabal
+++ b/ihaskell-display/ihaskell-charts/ihaskell-charts.cabal
@@ -59,7 +59,7 @@ library
-- Other library packages from which modules are imported.
build-depends: base >=4.6 && <4.9,
- classy-prelude >=0.6,
+ classy-prelude >=0.10.5,
bytestring,
data-default-class,
directory,
diff --git a/ihaskell-display/ihaskell-diagrams/IHaskell/Display/Diagrams.hs b/ihaskell-display/ihaskell-diagrams/IHaskell/Display/Diagrams.hs
index 33438aa713d14e6593cdbe40008b983e90ca9f74..e8ca9daa4e4956208ae9e5083e23120489e5a2da 100644
--- a/ihaskell-display/ihaskell-diagrams/IHaskell/Display/Diagrams.hs
+++ b/ihaskell-display/ihaskell-diagrams/IHaskell/Display/Diagrams.hs
@@ -36,7 +36,7 @@ diagramData renderable format = do
renderCairo filename (mkSizeSpec2D (Just imgWidth) (Just imgHeight)) renderable
-- Convert to base64.
- imgData <- readFile $ fpFromString filename
+ imgData <- readFile filename
let value =
case format of
PNG -> png (floor imgWidth) (floor imgHeight) $ base64 imgData
diff --git a/ihaskell-display/ihaskell-diagrams/IHaskell/Display/Diagrams/Animation.hs b/ihaskell-display/ihaskell-diagrams/IHaskell/Display/Diagrams/Animation.hs
index b00b3afb5d36753e66170e6bcb97dcfe3e77b6cf..13eb472322aa710360df2c34c534689e9840274f 100644
--- a/ihaskell-display/ihaskell-diagrams/IHaskell/Display/Diagrams/Animation.hs
+++ b/ihaskell-display/ihaskell-diagrams/IHaskell/Display/Diagrams/Animation.hs
@@ -47,7 +47,7 @@ animationData renderable = do
mainRender (diagOpts, gifOpts) frameSet
-- Convert to ascii represented base64 encoding
- imgData <- readFile $ fpFromString filename
+ imgData <- readFile filename
return . unpack . base64 $ imgData
-- Rendering hint.
diff --git a/ihaskell-display/ihaskell-diagrams/ihaskell-diagrams.cabal b/ihaskell-display/ihaskell-diagrams/ihaskell-diagrams.cabal
index 3d29f6d5e232872e7e669c1c07475f552f4b7586..493d3f6000bcac21576dbe78b3a16ee15fceb829 100644
--- a/ihaskell-display/ihaskell-diagrams/ihaskell-diagrams.cabal
+++ b/ihaskell-display/ihaskell-diagrams/ihaskell-diagrams.cabal
@@ -7,7 +7,7 @@ name: ihaskell-diagrams
-- PVP summary: +-+------- breaking API changes
-- | | +----- non-breaking API additions
-- | | | +--- code changes with no API change
-version: 0.2.0.0
+version: 0.2.1.0
-- A short (one-line) description of the package.
synopsis: IHaskell display instances for diagram types
@@ -59,7 +59,7 @@ library
-- Other library packages from which modules are imported.
build-depends: base >=4.6 && <4.9,
- classy-prelude >=0.6,
+ classy-prelude >=0.10.5,
bytestring,
directory,
-- Use diagrams wrapper package to ensure all same versions of subpackages
diff --git a/ihaskell-display/ihaskell-juicypixels/IHaskell/Display/Juicypixels.hs b/ihaskell-display/ihaskell-juicypixels/IHaskell/Display/Juicypixels.hs
index 4fb53a2d734992b6936756205b9b6901edd4ee5b..aeb03e46a0512dda148a7c64bd394b6d6cc98c79 100644
--- a/ihaskell-display/ihaskell-juicypixels/IHaskell/Display/Juicypixels.hs
+++ b/ihaskell-display/ihaskell-juicypixels/IHaskell/Display/Juicypixels.hs
@@ -60,7 +60,7 @@ displayImageAsJpg renderable = do
-- Write the image
saveJpgImage 95 filename renderable
-- Convert to base64.
- imgData <- readFile $ fpFromString filename
+ imgData <- readFile filename
return $ Display [jpg (imWidth renderable) (imHeight renderable) $ base64 imgData]
-- The type DynamicImage does not have a function to extract width and height
diff --git a/ihaskell-display/ihaskell-juicypixels/ihaskell-juicypixels.cabal b/ihaskell-display/ihaskell-juicypixels/ihaskell-juicypixels.cabal
index 4c047b9925da74427ad01c7cd5e52fbcc05fe8f6..478e638ea1f184090ce7420cb9e53a99d5b7eb18 100644
--- a/ihaskell-display/ihaskell-juicypixels/ihaskell-juicypixels.cabal
+++ b/ihaskell-display/ihaskell-juicypixels/ihaskell-juicypixels.cabal
@@ -63,7 +63,7 @@ library
-- Other library packages from which modules are imported.
build-depends: base >=4.6 && <4.9,
- classy-prelude >=0.6,
+ classy-prelude >=0.10.5,
bytestring,
directory,
JuicyPixels >= 3.1.3,
diff --git a/ihaskell-display/ihaskell-plot/IHaskell/Display/Plot.hs b/ihaskell-display/ihaskell-plot/IHaskell/Display/Plot.hs
index c20804fdd76e05ba86f494b439153488cb316567..71ced7ec853fe8385fbd66fa8923fea672e0e2d4 100644
--- a/ihaskell-display/ihaskell-plot/IHaskell/Display/Plot.hs
+++ b/ihaskell-display/ihaskell-plot/IHaskell/Display/Plot.hs
@@ -31,7 +31,7 @@ figureData figure format = do
writeFigure format fname (w, h) figure
-- Read back, and convert to base64.
- imgData <- readFile $ fpFromString fname
+ imgData <- readFile fname
let value =
case format of
PNG -> png w h $ base64 imgData
@@ -43,4 +43,4 @@ figureData figure format = do
where
extension SVG = "svg"
extension PNG = "png"
- extension _ = ""
\ No newline at end of file
+ extension _ = ""
diff --git a/ihaskell-display/ihaskell-plot/ihaskell-plot.cabal b/ihaskell-display/ihaskell-plot/ihaskell-plot.cabal
index e621af7e3ee88ff70139e7334a70fddf3ad96e9d..5188695070f1a679cc091e41776d936f026873e6 100644
--- a/ihaskell-display/ihaskell-plot/ihaskell-plot.cabal
+++ b/ihaskell-display/ihaskell-plot/ihaskell-plot.cabal
@@ -59,7 +59,7 @@ library
-- Other library packages from which modules are imported.
build-depends: base >=4.6 && <4.9,
- classy-prelude,
+ classy-prelude >= 0.10.5,
plot,
bytestring,
ihaskell >= 0.5
diff --git a/ihaskell-display/ihaskell-rlangqq/ihaskell-rlangqq.cabal b/ihaskell-display/ihaskell-rlangqq/ihaskell-rlangqq.cabal
index f11f346342b58b4b347128716ea35136f149f723..bf8570ef2e6f15d294871f8007e14e2923d040bb 100644
--- a/ihaskell-display/ihaskell-rlangqq/ihaskell-rlangqq.cabal
+++ b/ihaskell-display/ihaskell-rlangqq/ihaskell-rlangqq.cabal
@@ -1,5 +1,5 @@
name: ihaskell-rlangqq
-version: 0.2.0.1
+version: 0.2.1.1
synopsis: a rDisp quasiquote to show plots from Rlang-QQ in IHaskell
license: BSD3
license-file: LICENSE
@@ -18,7 +18,7 @@ library
filepath >=1.3 && <1.5,
bytestring >=0.10 && <0.11,
base64-bytestring >=1.0 && <1.1,
- ihaskell >= 0.5,
+ ihaskell >= 0.6.1,
ihaskell-blaze >=0.2 && <0.3,
blaze-html >=0.6 && <0.9,
split >=0.2 && <0.3,
diff --git a/ihaskell.cabal b/ihaskell.cabal
index b530010330a3bc07beb4ab00286cd086b93bea9b..f747cfa0e7f1f5ea34c1e3b9f1b3407c18a5ee4e 100644
--- a/ihaskell.cabal
+++ b/ihaskell.cabal
@@ -7,7 +7,7 @@ name: ihaskell
-- PVP summary: +-+------- breaking API changes
-- | | +----- non-breaking API additions
-- | | | +--- code changes with no API change
-version: 0.6.0.0
+version: 0.6.2.0
-- A short (one-line) description of the package.
synopsis: A Haskell backend kernel for the IPython project.
@@ -60,7 +60,7 @@ library
base64-bytestring >=1.0,
bytestring >=0.10,
cereal >=0.3,
- classy-prelude >=0.9.5 && <0.11,
+ classy-prelude >=0.10.5 && <0.11,
mono-traversable >=0.6,
cmdargs >=0.10,
containers >=0.5,
@@ -96,7 +96,7 @@ library
utf8-string -any,
uuid >=1.3,
vector -any,
- ipython-kernel >=0.6
+ ipython-kernel >=0.6.1
if flag(binPkgDb)
build-depends: bin-package-db
@@ -135,7 +135,7 @@ executable ihaskell
aeson >=0.6 && < 0.9,
bytestring >=0.10,
cereal >=0.3,
- classy-prelude >=0.9.2 && <0.11,
+ classy-prelude >=0.10.5 && <0.11,
mono-traversable >=0.6,
containers >=0.5,
directory -any,
@@ -144,7 +144,7 @@ executable ihaskell
MissingH >=1.2,
here ==1.2.*,
text -any,
- ipython-kernel >= 0.6,
+ ipython-kernel >= 0.6.1,
unix >= 2.6
if flag(binPkgDb)
build-depends: bin-package-db
@@ -161,7 +161,7 @@ Test-Suite hspec
base64-bytestring >=1.0,
bytestring >=0.10,
cereal >=0.3,
- classy-prelude >=0.9.2 && <0.11,
+ classy-prelude >=0.10.5 && <0.11,
mono-traversable >=0.6,
cmdargs >=0.10,
containers >=0.5,
@@ -198,7 +198,7 @@ Test-Suite hspec
uuid >=1.3,
vector -any,
setenv ==0.1.*,
- ipython-kernel >= 0.6
+ ipython-kernel >= 0.6.1
if flag(binPkgDb)
build-depends: bin-package-db
diff --git a/ipython-kernel/ipython-kernel.cabal b/ipython-kernel/ipython-kernel.cabal
index 07b8c2755070384ce88374c9059e8c1a9d7031de..c82ddc8c4826e595b746f077de188c9dba34997a 100644
--- a/ipython-kernel/ipython-kernel.cabal
+++ b/ipython-kernel/ipython-kernel.cabal
@@ -1,5 +1,5 @@
name: ipython-kernel
-version: 0.6.0.0
+version: 0.6.1.0
synopsis: A library for creating kernels for IPython frontends
description: ipython-kernel is a library for communicating with frontends for the interactive IPython framework. It is used extensively in IHaskell, the interactive Haskell environment.
diff --git a/src/IHaskell/Eval/Evaluate.hs b/src/IHaskell/Eval/Evaluate.hs
index 895474a614cf943b3d018d80fbebae02201e255b..1823b04398a221c64c7566eb16de91c01d32de49 100644
--- a/src/IHaskell/Eval/Evaluate.hs
+++ b/src/IHaskell/Eval/Evaluate.hs
@@ -403,7 +403,7 @@ evalCommand _ (Module contents) state = wrapExecution state $ do
filename = last namePieces ++ ".hs"
liftIO $ do
createDirectoryIfMissing True directory
- writeFile (fpFromString $ directory ++ filename) contents
+ writeFile (directory ++ filename) contents
-- Clear old modules of this name
let modName = intercalate "." namePieces
@@ -565,7 +565,7 @@ evalCommand _ (Directive LoadFile names) state = wrapExecution state $ do
let filename = if endswith ".hs" name
then name
else name ++ ".hs"
- contents <- readFile $ fpFromString filename
+ contents <- readFile filename
modName <- intercalate "." <$> getModuleName contents
doLoadModule filename modName
return (ManyDisplay displays)
diff --git a/src/Main.hs b/src/Main.hs
index 8f11e6e3bd529ca3afc6c95d6c524c118f978614..e66ad1b73692491b12b24572bc301b3ba1927be6 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -101,7 +101,7 @@ runKernel kernelOpts profileSrc = do
libdir = kernelSpecGhcLibdir kernelOpts
-- Parse the profile file.
- Just profile <- liftM decode . readFile . fpFromText $ pack profileSrc
+ Just profile <- liftM decode . readFile $ profileSrc
-- Necessary for `getLine` and their ilk to work.
dir <- getIHaskellDir
@@ -131,7 +131,7 @@ runKernel kernelOpts profileSrc = do
confFile <- liftIO $ kernelSpecConfFile kernelOpts
case confFile of
- Just filename -> liftIO (readFile $ fpFromString filename) >>= evaluator
+ Just filename -> liftIO (readFile filename) >>= evaluator
Nothing -> return ()
forever $ do