move getStoreDir to remote, drop mtl from core

Author: sorki

hnix-store-core/hnix-store-core.cabal

@@ -84,7 +84,6 @@ library
     , hashable
     -- Required for cryptonite low-level type convertion
     , memory
-    , mtl
     , nix-derivation >= 1.1.1 && <2
     , saltine >= 0.2 && < 0.3
     , some > 1.0.5 && < 2

hnix-store-core/src/System/Nix/StorePath.hs

@@ -9,7 +9,6 @@ module System.Nix.StorePath
   ( -- * Basic store path types
     StoreDir(..)
   , HasStoreDir(..)
-  , getStoreDir
   , StorePath
   , storePathHash
   , storePathName
@@ -37,7 +36,6 @@ module System.Nix.StorePath
   , unsafeMakeStorePath
   ) where
 
-import Control.Monad.Reader.Class (MonadReader, asks)
 import Crypto.Hash (HashAlgorithm)
 import Data.Attoparsec.Text.Lazy (Parser, (<?>))
 import Data.ByteString (ByteString)
@@ -178,10 +176,6 @@ instance Default StoreDir where
 class HasStoreDir r where
   hasStoreDir :: r -> StoreDir
 
--- | Ask for a @StoreDir@
-getStoreDir :: (HasStoreDir r, MonadReader r m) => m StoreDir
-getStoreDir = asks hasStoreDir
-
 -- | Render a 'StorePath' as a 'RawFilePath'.
 storePathToRawFilePath :: StoreDir -> StorePath -> RawFilePath
 storePathToRawFilePath storeDir StorePath{..} =

hnix-store-core/tests/Hash.hs

@@ -5,7 +5,7 @@ module Hash where
 
 import Data.ByteString (ByteString)
 
-import Control.Monad
+import Control.Monad (forM_)
 import Crypto.Hash (MD5, SHA1, SHA256, hash)
 import qualified Data.ByteString.Base16      as B16
 import qualified System.Nix.Base32           as B32

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

@@ -13,6 +13,7 @@ module System.Nix.Store.Remote.Types
   , Field(..)
   , mapStoreDir
   , getStoreDir
+  , getStoreDir'
   , getLog
   , flushLog
   , gotError
@@ -23,6 +24,7 @@ module System.Nix.Store.Remote.Types
 
 import Control.Monad.Except (ExceptT)
 import Control.Monad.Reader (ReaderT, asks)
+import Control.Monad.Reader.Class (MonadReader)
 import Control.Monad.State.Strict (StateT, gets, modify)
 import Data.ByteString (ByteString)
 import Network.Socket (Socket)
@@ -33,7 +35,7 @@ import Control.Monad.Trans.State.Strict (mapStateT)
 import Control.Monad.Trans.Except (mapExceptT)
 import Control.Monad.Trans.Reader (withReaderT)
 
-import           System.Nix.StorePath          ( StoreDir )
+import System.Nix.StorePath (HasStoreDir(..), StoreDir)
 
 
 data StoreConfig = StoreConfig
@@ -57,6 +59,10 @@ doSubstitute, dontSubstitute :: SubstituteFlag
 doSubstitute = SubstituteFlag True
 dontSubstitute = SubstituteFlag False
 
+-- | Ask for a @StoreDir@
+getStoreDir' :: (HasStoreDir r, MonadReader r m) => m StoreDir
+getStoreDir' = asks hasStoreDir
+
 type MonadStore a
   = ExceptT
       String