mirror of
https://github.com/IHaskell/IHaskell.git
synced 2025-04-16 11:26:08 +00:00
Updating for classy-prelude fixes, etc
This commit is contained in:
Andrew Gibiansky
parent
73469b7c9c
commit
accbec475f
@ -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
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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 _ = ""
|
||||
extension _ = ""
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user