1b8d006 · typeable/pandoc

git.iko.soy/typeable/pandoc

Revert "Require process >= 1.2.1."

This reverts commit 07a4320ba97cdd219e5cbb18f21dbbda00bc5543.

commit1b8d006ac848d146a4b29167f9037306bfaae559 authorJohn MacFarlane <jgm@berkeley.edu> dateThu 12 May 2016, 20:59 (10 years ago) parentf3039d3

2 files changed+9−4

compare with master

unifiedsplit

pandoc.cabal+3−3 pandoc.hs+6−1

pandoc.cabal+3−3

@@ -254,7 +254,7 @@ Library

254254 parsec >= 3.1 && < 3.2,

255255 mtl >= 1.1 && < 2.3,

256256 filepath >= 1.1 && < 1.5,

257− process >= 1.2.1 && < 1.5,

257+ process >= 1 && < 1.5,

258258 directory >= 1 && < 1.3,

259259 bytestring >= 0.9 && < 0.11,

260260 text >= 0.11 && < 1.3,

@@ -426,7 +426,7 @@ Executable pandoc

426426 yaml >= 0.8.8.2 && < 0.9,

427427 containers >= 0.1 && < 0.6,

428428 HTTP >= 4000.0.5 && < 4000.4,

429− process >= 1.2.1 && < 1.5

429+ process >= 1.0 && < 1.5

430430 if flag(network-uri)

431431 Build-Depends: network-uri >= 2.6 && < 2.7, network >= 2.6

432432 else

@@ -477,7 +477,7 @@ Test-Suite test-pandoc

477477 text >= 0.11 && < 1.3,

478478 directory >= 1 && < 1.3,

479479 filepath >= 1.1 && < 1.5,

480− process >= 1.2.1 && < 1.5,

480+ process >= 1 && < 1.5,

481481 highlighting-kate >= 0.6.1 && < 0.7,

482482 Diff >= 0.2 && < 0.4,

483483 test-framework >= 0.3 && < 0.9,

pandoc.hs+6−1

@@ -52,8 +52,13 @@ import Data.Char ( toLower, toUpper )

5252import Data.List ( delete, intercalate, isPrefixOf, isSuffixOf, sort )

5353import System.Directory ( getAppUserDataDirectory, findExecutable,

5454 doesFileExist, Permissions(..), getPermissions )

55−import System.Process ( shell, CreateProcess(..), createProcess_,

55+import System.Process ( shell, CreateProcess(..),

5656 waitForProcess, StdStream(CreatePipe) )

57+#if MIN_VERSION_process(1,2,1)

58+import System.Process ( createProcess_ )

59+#else

60+import System.Process.Internals ( createProcess_ )

61+#endif

5762import System.IO ( stdout, stderr, hClose )

5863import System.IO.Error ( isDoesNotExistError )

5964import qualified Control.Exception as E