Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Revert "Require process >= 1.2.1."

Browse source 
This reverts commit 07a4320ba9.
This commit is contained in:
John MacFarlane 2016-05-12 20:59:08 -07:00
parent f3039d3af9
commit 1b8d006ac8
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pandoc.cabal
View file

@ -254,7 +254,7 @@ Library
parsec >= 3.1 && < 3.2,
mtl >= 1.1 && < 2.3,
filepath >= 1.1 && < 1.5,
process >= 1.2.1 && < 1.5,
process >= 1 && < 1.5,
directory >= 1 && < 1.3,
bytestring >= 0.9 && < 0.11,
text >= 0.11 && < 1.3,
@ -426,7 +426,7 @@ Executable pandoc
yaml >= 0.8.8.2 && < 0.9,
containers >= 0.1 && < 0.6,
HTTP >= 4000.0.5 && < 4000.4,
process >= 1.2.1 && < 1.5
process >= 1.0 && < 1.5
if flag(network-uri)
Build-Depends: network-uri >= 2.6 && < 2.7, network >= 2.6
else
@ -477,7 +477,7 @@ Test-Suite test-pandoc
text >= 0.11 && < 1.3,
directory >= 1 && < 1.3,
filepath >= 1.1 && < 1.5,
process >= 1.2.1 && < 1.5,
process >= 1 && < 1.5,
highlighting-kate >= 0.6.1 && < 0.7,
Diff >= 0.2 && < 0.4,
test-framework >= 0.3 && < 0.9,

7
pandoc.hs
View file

@ -52,8 +52,13 @@ import Data.Char ( toLower, toUpper )
import Data.List ( delete, intercalate, isPrefixOf, isSuffixOf, sort )
import System.Directory ( getAppUserDataDirectory, findExecutable,
doesFileExist, Permissions(..), getPermissions )
import System.Process ( shell, CreateProcess(..), createProcess_,
import System.Process ( shell, CreateProcess(..),
waitForProcess, StdStream(CreatePipe) )
#if MIN_VERSION_process(1,2,1)
import System.Process ( createProcess_ )
#else
import System.Process.Internals ( createProcess_ )
#endif
import System.IO ( stdout, stderr, hClose )
import System.IO.Error ( isDoesNotExistError )
import qualified Control.Exception as E