remote: squash whitespace

hnix-store-remote/src/System/Nix/Store/Remote.hs

@@ -45,21 +45,10 @@ import qualified Data.ByteString.Lazy          as BSL
 
 import System.Nix.Derivation (Derivation)
 import System.Nix.Store.Types (FileIngestionMethod(..), RepairMode(..))
-import           System.Nix.Build               ( BuildMode
-                                                , BuildResult
-                                                )
-import           System.Nix.Hash                ( NamedAlgo(..)
-                                                , BaseEncoding(Base16)
-                                                , decodeDigestWith
-                                                )
-import           System.Nix.StorePath           ( StorePath
-                                                , StorePathName
-                                                , StorePathHashPart
-                                                , InvalidPathError
-                                                )
-import           System.Nix.StorePath.Metadata  ( Metadata(..)
-                                                , StorePathTrust(..)
-                                                )
+import System.Nix.Build (BuildMode, BuildResult)
+import System.Nix.Hash (NamedAlgo(..), BaseEncoding(Base16), decodeDigestWith)
+import System.Nix.StorePath (StorePath, StorePathName, StorePathHashPart, InvalidPathError)
+import System.Nix.StorePath.Metadata  (Metadata(..), StorePathTrust(..))
 
 import qualified Data.Binary.Put
 import qualified Data.Map.Strict
@@ -67,15 +56,14 @@ import qualified Data.Set
 
 import qualified System.Nix.ContentAddress
 import qualified System.Nix.StorePath
-
-import           System.Nix.Store.Remote.Binary
-import           System.Nix.Store.Remote.Types
-import           System.Nix.Store.Remote.Protocol
-import           System.Nix.Store.Remote.Util
 import qualified System.Nix.Signature
-import           Crypto.Hash                    ( SHA256 )
-import           System.Nix.Nar                 ( NarSource )
 
+import System.Nix.Store.Remote.Binary
+import System.Nix.Store.Remote.Types
+import System.Nix.Store.Remote.Protocol
+import System.Nix.Store.Remote.Util
+import Crypto.Hash (SHA256)
+import System.Nix.Nar (NarSource)
 
 -- | Pack `Nar` and add it to the store.
 addToStore

hnix-store-remote/src/System/Nix/Store/Remote/Binary.hs

@@ -6,8 +6,8 @@ module System.Nix.Store.Remote.Binary where
 
 import Control.Monad
 import Data.ByteString (ByteString)
-import           Data.Binary.Get
-import           Data.Binary.Put
+import Data.Binary.Get
+import Data.Binary.Put
 import qualified Data.ByteString.Lazy          as BSL
 
 putInt :: Integral a => a -> Put

hnix-store-remote/src/System/Nix/Store/Remote/Logger.hs

@@ -5,18 +5,15 @@ module System.Nix.Store.Remote.Logger
   , processOutput
   ) where
 
-import           Control.Monad.Except           ( throwError )
+import Control.Monad.Except (throwError)
 import Control.Monad.IO.Class (liftIO)
 import Control.Monad.Reader (asks)
 import Control.Monad.State.Strict (get)
-import           Data.Binary.Get
-
-import           Network.Socket.ByteString      ( recv )
-
-import           System.Nix.Store.Remote.Binary
-import           System.Nix.Store.Remote.Types
-import           System.Nix.Store.Remote.Util
-
+import Data.Binary.Get
+import Network.Socket.ByteString (recv)
+import System.Nix.Store.Remote.Binary
+import System.Nix.Store.Remote.Types
+import System.Nix.Store.Remote.Util
 
 import qualified Control.Monad
 

hnix-store-remote/src/System/Nix/Store/Remote/Protocol.hs

@@ -16,30 +16,28 @@ module System.Nix.Store.Remote.Protocol
   ) where
 
 import qualified Control.Monad
-import           Control.Exception              ( bracket )
-import           Control.Monad.Except
-import           Control.Monad.Reader (asks, runReaderT)
-import           Control.Monad.State.Strict
+import Control.Exception              ( bracket )
+import Control.Monad.Except
+import Control.Monad.Reader (asks, runReaderT)
+import Control.Monad.State.Strict
 
 import Data.Default.Class (Default(def))
 import qualified Data.Bool
-import           Data.Binary.Get
-import           Data.Binary.Put
+import Data.Binary.Get
+import Data.Binary.Put
 import qualified Data.ByteString
 import qualified Data.ByteString.Char8
 import qualified Data.ByteString.Lazy
 
-import           Network.Socket                 ( SockAddr(SockAddrUnix) )
-import qualified Network.Socket                 as S
-import           Network.Socket.ByteString      ( recv
-                                                , sendAll
-                                                )
+import Network.Socket (SockAddr(SockAddrUnix))
+import qualified Network.Socket as S
+import Network.Socket.ByteString (recv, sendAll)
 
-import           System.Nix.StorePath           ( StoreDir(..) )
-import           System.Nix.Store.Remote.Binary
-import           System.Nix.Store.Remote.Logger
-import           System.Nix.Store.Remote.Types hiding (protoVersion)
-import           System.Nix.Store.Remote.Util
+import System.Nix.StorePath (StoreDir(..))
+import System.Nix.Store.Remote.Binary
+import System.Nix.Store.Remote.Logger
+import System.Nix.Store.Remote.Types hiding (protoVersion)
+import System.Nix.Store.Remote.Util
 
 protoVersion :: Int
 protoVersion = 0x115

hnix-store-remote/src/System/Nix/Store/Remote/Types.hs

@@ -30,7 +30,7 @@ import Control.Monad.State.Strict (StateT, gets, modify)
 import Data.ByteString (ByteString)
 import Network.Socket (Socket)
 
-import qualified Data.ByteString.Lazy          as BSL
+import qualified Data.ByteString.Lazy as BSL
 
 import Control.Monad.Trans.State.Strict (mapStateT)
 import Control.Monad.Trans.Except (mapExceptT)

hnix-store-remote/src/System/Nix/Store/Remote/Util.hs

@@ -1,32 +1,30 @@
 module System.Nix.Store.Remote.Util where
 
-import           Control.Monad.Except (throwError)
-import           Control.Monad.Reader (asks)
-import           Control.Monad.IO.Class (MonadIO(..))
+import Control.Monad.Except (throwError)
+import Control.Monad.Reader (asks)
+import Control.Monad.IO.Class (MonadIO(..))
 import Data.ByteString (ByteString)
 import Data.HashSet (HashSet)
 import Data.Text (Text)
 import Data.Either (rights)
 
-import           Data.Binary.Get
-import           Data.Binary.Put
-import qualified Data.Text.Encoding            as T
-import qualified Data.Text.Lazy                as TL
-import qualified Data.Text.Lazy.Encoding       as TL
-import           Data.Time
-import           Data.Time.Clock.POSIX
-import qualified Data.ByteString.Char8         as BSC
-import qualified Data.ByteString.Lazy          as BSL
+import Data.Binary.Get
+import Data.Binary.Put
+import qualified Data.Text.Encoding as T
+import qualified Data.Text.Lazy as TL
+import qualified Data.Text.Lazy.Encoding as TL
+import Data.Time
+import Data.Time.Clock.POSIX
+import qualified Data.ByteString.Char8 as BSC
+import qualified Data.ByteString.Lazy as BSL
 
-import           Network.Socket.ByteString      ( recv
-                                                , sendAll
-                                                )
+import Network.Socket.ByteString (recv, sendAll)
 
-import           System.Nix.Build
-import           System.Nix.Derivation
-import           System.Nix.StorePath (StoreDir, StorePath, InvalidPathError, parsePath, storePathToRawFilePath)
-import           System.Nix.Store.Remote.Binary
-import           System.Nix.Store.Remote.Types
+import System.Nix.Build
+import System.Nix.Derivation
+import System.Nix.StorePath (StoreDir, StorePath, InvalidPathError, parsePath, storePathToRawFilePath)
+import System.Nix.Store.Remote.Binary
+import System.Nix.Store.Remote.Types
 
 import qualified Data.HashSet
 import qualified Data.Map

hnix-store-remote/tests-io/NixDaemon.hs

@@ -3,42 +3,35 @@
 module NixDaemon where
 
 import Data.Text (Text)
-import           Data.Either                    ( isRight
-                                                , isLeft
-                                                )
-import           Data.Bool                      ( bool )
-import           Control.Monad                  ( void )
-import           Control.Monad.IO.Class         ( liftIO )
+import Data.Either (isRight, isLeft)
+import Data.Bool (bool)
+import Control.Monad (void)
+import Control.Monad.IO.Class (liftIO)
 
 import qualified System.Environment
-import           Control.Exception              ( bracket )
-import           Control.Concurrent             ( threadDelay )
-import qualified Data.ByteString.Char8         as BSC
+import Control.Exception (bracket)
+import Control.Concurrent (threadDelay)
+import qualified Data.ByteString.Char8 as BSC
 import qualified Data.Either
-import qualified Data.HashSet                  as HS
-import qualified Data.Map.Strict               as M
-import           System.Directory
-import           System.IO.Temp
-import qualified System.Process                as P
-import           System.Posix.User             as U
-import           System.Linux.Namespaces       as NS
-import           Test.Hspec                     ( Spec
-                                                , describe
-                                                , context
-                                                )
-import qualified Test.Hspec                    as Hspec
-import           Test.Hspec.Expectations.Lifted
+import qualified Data.HashSet as HS
+import qualified Data.Map.Strict as M
+import System.Directory
+import System.IO.Temp
+import qualified System.Process as P
+import System.Posix.User as U
+import System.Linux.Namespaces as NS
+import Test.Hspec (Spec, describe, context)
+import qualified Test.Hspec as Hspec
+import Test.Hspec.Expectations.Lifted
+import System.FilePath
+import System.Nix.Build
+import System.Nix.StorePath
+import System.Nix.StorePath.Metadata
+import System.Nix.Store.Remote
+import System.Nix.Store.Remote.Protocol
 
-import           System.FilePath
-
-import           System.Nix.Build
-import           System.Nix.StorePath
-import           System.Nix.StorePath.Metadata
-import           System.Nix.Store.Remote
-import           System.Nix.Store.Remote.Protocol
-
-import           Crypto.Hash                    ( SHA256 )
-import           System.Nix.Nar                 ( dumpPath )
+import Crypto.Hash (SHA256)
+import System.Nix.Nar (dumpPath)
 
 createProcessEnv :: FilePath -> String -> [String] -> IO P.ProcessHandle
 createProcessEnv fp proc args = do