mirror of
https://github.com/IHaskell/IHaskell.git
synced 2025-04-16 11:26:08 +00:00
require shelly 1.3, and add note about why
This commit is contained in:
parent
891cfe419e
commit
a741c62b00
@ -79,7 +79,7 @@ library
|
||||
parsec -any,
|
||||
process >=1.1,
|
||||
random >=1.0,
|
||||
shelly >=1.3,
|
||||
shelly ==1.3.*,
|
||||
split >= 0.2,
|
||||
strict >=0.3,
|
||||
system-argv0 -any,
|
||||
@ -157,7 +157,7 @@ executable IHaskell
|
||||
parsec -any,
|
||||
process >=1.1,
|
||||
random >=1.0,
|
||||
shelly >=1.3,
|
||||
shelly ==1.3.*,
|
||||
split >= 0.2,
|
||||
strict >=0.3,
|
||||
system-argv0 -any,
|
||||
@ -201,7 +201,7 @@ Test-Suite hspec
|
||||
process >=1.1,
|
||||
random >=1.0,
|
||||
setenv -any,
|
||||
shelly >=1.3,
|
||||
shelly ==1.3.*,
|
||||
split >= 0.2,
|
||||
strict >=0.3,
|
||||
system-argv0 -any,
|
||||
|
@ -55,6 +55,12 @@ ipython which suppress args = do
|
||||
runCmd <- liftIO $ Paths.getDataFileName "installation/run.sh"
|
||||
venv <- fpToText <$> ipythonDir
|
||||
let cmdArgs = [pack runCmd, venv] ++ args
|
||||
|
||||
-- We have this because `silently` in shelly < 1.4 does not silence
|
||||
-- stderr. In shelly 1.4, however, using `run` does not let us use stdin,
|
||||
-- and the current code breaks for unknown reasons. When the bug
|
||||
-- https://github.com/yesodweb/Shelly.hs/issues/54
|
||||
-- is closed, we should edit ihaskell.cabal to allow shelly 1.4.
|
||||
runHandles "bash" cmdArgs handles doNothing
|
||||
where handles = [InHandle Inherit, outHandle suppress, errorHandle suppress]
|
||||
outHandle True = OutHandle CreatePipe
|
||||
|
Loading…
x
Reference in New Issue
Block a user