Fix build with process 1.2.1.0.

Assistant/XMPP/Git.hs

@@ -38,6 +38,7 @@ import Utility.Env
 import Network.Protocol.XMPP
 import qualified Data.Text as T
 import System.Posix.Types
+import qualified System.Posix.IO
 import Control.Concurrent
 import System.Timeout
 import qualified Data.ByteString as B
@@ -104,9 +105,9 @@ xmppPush cid gitpush = do
 	u <- liftAnnex getUUID
 	sendNetMessage $ Pushing cid (StartingPush u)
 
-	(Fd inf, writepush) <- liftIO createPipe
-	(readpush, Fd outf) <- liftIO createPipe
-	(Fd controlf, writecontrol) <- liftIO createPipe
+	(Fd inf, writepush) <- liftIO System.Posix.IO.createPipe
+	(readpush, Fd outf) <- liftIO System.Posix.IO.createPipe
+	(Fd controlf, writecontrol) <- liftIO System.Posix.IO.createPipe
 
 	tmpdir <- gettmpdir
 	installwrapper tmpdir

Common.hs

@@ -16,7 +16,7 @@ import System.FilePath as X
 import System.Directory as X
 import System.IO as X hiding (FilePath)
 #ifndef mingw32_HOST_OS
-import System.Posix.IO as X
+import System.Posix.IO as X hiding (createPipe)
 #endif
 import System.Exit as X
 

Utility/Gpg.hs

@@ -19,6 +19,7 @@ import qualified Build.SysConfig as SysConfig
 
 #ifndef mingw32_HOST_OS
 import System.Posix.Types
+import qualified System.Posix.IO
 import System.Path
 import Utility.Env
 #else
@@ -108,7 +109,7 @@ feedRead :: (MonadIO m, MonadMask m) => [CommandParam] -> String -> (Handle -> I
 feedRead params passphrase feeder reader = do
 #ifndef mingw32_HOST_OS
 	-- pipe the passphrase into gpg on a fd
-	(frompipe, topipe) <- liftIO createPipe
+	(frompipe, topipe) <- liftIO System.Posix.IO.createPipe
 	liftIO $ void $ forkIO $ do
 		toh <- fdToHandle topipe
 		hPutStrLn toh passphrase

Utility/Process.hs

@@ -1,7 +1,7 @@
 {- System.Process enhancements, including additional ways of running
  - processes, and logging.
  -
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
  -
  - License: BSD-2-clause
  -}
@@ -38,7 +38,7 @@ module Utility.Process (
 ) where
 
 import qualified System.Process
-import System.Process as X hiding (CreateProcess(..), createProcess, runInteractiveProcess, readProcess, readProcessWithExitCode, system, rawSystem, runInteractiveCommand, runProcess)
+import qualified System.Process as X hiding (CreateProcess(..), createProcess, runInteractiveProcess, readProcess, readProcessWithExitCode, system, rawSystem, runInteractiveCommand, runProcess)
 import System.Process hiding (createProcess, readProcess)
 import System.Exit
 import System.IO
@@ -47,7 +47,7 @@ import Control.Concurrent
 import qualified Control.Exception as E
 import Control.Monad
 #ifndef mingw32_HOST_OS
-import System.Posix.IO
+import qualified System.Posix.IO
 #else
 import Control.Applicative
 #endif
@@ -175,9 +175,9 @@ processTranscript' cmd opts environ input = do
 #ifndef mingw32_HOST_OS
 {- This implementation interleves stdout and stderr in exactly the order
  - the process writes them. -}
-	(readf, writef) <- createPipe
-	readh <- fdToHandle readf
-	writeh <- fdToHandle writef
+	(readf, writef) <- System.Posix.IO.createPipe
+	readh <- System.Posix.IO.fdToHandle readf
+	writeh <- System.Posix.IO.fdToHandle writef
 	p@(_, _, _, pid) <- createProcess $
 		(proc cmd opts)
 			{ std_in = if isJust input then CreatePipe else Inherit

debian/changelog

@@ -3,8 +3,9 @@ git-annex (5.20141232) UNRELEASED; urgency=medium
   * unlock: Don't allow unlocking files that have never been committed to git
     before, to avoid an intractable problem that prevents the pre-commit
     hook from telling if such a file is intended to be an annexed file or not.
-  « Avoid re-checksumming when migrating from hash to hashE backend.
+  * Avoid re-checksumming when migrating from hash to hashE backend.
     Closes: #774494
+  * Fix build with process 1.2.1.0.
 
  -- Joey Hess <id@joeyh.name>  Fri, 02 Jan 2015 13:35:13 -0400