diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2016-05-12 20:59:08 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2016-05-12 20:59:08 -0700 |
| commit | 1b8d006ac848d146a4b29167f9037306bfaae559 (patch) | |
| tree | b2a61157a5c694949cf7032aba81786bd7f1108c | |
| parent | f3039d3af94e297a36b7fdd338b673cb5f5cda84 (diff) | |
| download | pandoc-1b8d006ac848d146a4b29167f9037306bfaae559.tar.gz | |
Revert "Require process >= 1.2.1."
This reverts commit 07a4320ba97cdd219e5cbb18f21dbbda00bc5543.
| -rw-r--r-- | pandoc.cabal | 6 | ||||
| -rw-r--r-- | pandoc.hs | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 540e519ef..d1d623060 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -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, @@ -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 |