From 07a4320ba97cdd219e5cbb18f21dbbda00bc5543 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 12 May 2016 11:07:55 -0700
Subject: [PATCH] Require process >= 1.2.1.
We need `createProcess_` to be exported.
---
pandoc.cabal | 6 +++---
pandoc.hs | 7 +------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/pandoc.cabal b/pandoc.cabal
index d1d623060..540e519ef 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 && < 1.5,
+ process >= 1.2.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.0 && < 1.5
+ process >= 1.2.1 && < 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 && < 1.5,
+ process >= 1.2.1 && < 1.5,
highlighting-kate >= 0.6.1 && < 0.7,
Diff >= 0.2 && < 0.4,
test-framework >= 0.3 && < 0.9,
diff --git a/pandoc.hs b/pandoc.hs
index 78dcd6840..7a2a38d39 100644
--- a/pandoc.hs
+++ b/pandoc.hs
@@ -52,13 +52,8 @@ 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(..),
+import System.Process ( shell, CreateProcess(..), 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