core: re-export Derivation, DerivationOutput

Author: sorki

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

@@ -4,6 +4,9 @@
 module System.Nix.Derivation
   ( parseDerivation
   , buildDerivation
+  -- Re-exports
+  , Derivation(..)
+  , DerivationOutput(..)
   ) where
 
 import Data.Attoparsec.Text.Lazy (Parser)
@@ -13,7 +16,7 @@ import Test.QuickCheck (Arbitrary(..))
 import Test.QuickCheck.Arbitrary.Generic (GenericArbitrary(..))
 import Test.QuickCheck.Instances ()
 
-import Nix.Derivation (Derivation, DerivationOutput)
+import Nix.Derivation (Derivation(..), DerivationOutput(..))
 import System.Nix.StorePath (StoreDir, StorePath)
 
 import qualified Data.Attoparsec.Text.Lazy

hnix-store-remote/hnix-store-remote.cabal

@@ -73,6 +73,7 @@ library
 
   build-depends:
       base >=4.12 && <5
+    , hnix-store-core >= 0.7 && <0.8
     , attoparsec
     , binary
     , bytestring
@@ -84,10 +85,8 @@ library
     , text
     , time
     , network
-    , nix-derivation >= 1.1.1 && < 2
     , mtl
     , unordered-containers
-    , hnix-store-core >= 0.7 && <0.8
     , transformers
     , vector
   hs-source-dirs:      src
@@ -117,7 +116,6 @@ test-suite remote
       base >=4.12 && <5
     , hnix-store-core
     , hnix-store-remote
-    , nix-derivation
     , bytestring
     , cereal
     , text

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

@@ -41,7 +41,7 @@ import qualified System.Nix.Hash
 --
 import qualified Data.ByteString.Lazy          as BSL
 
-import           Nix.Derivation                 ( Derivation )
+import System.Nix.Derivation (Derivation)
 import           System.Nix.Build               ( BuildMode
                                                 , BuildResult
                                                 )

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

@@ -16,7 +16,7 @@ import qualified Data.Set
 import qualified Data.Text
 import qualified Data.Vector
 
-import Nix.Derivation (Derivation(..), DerivationOutput(..))
+import System.Nix.Derivation (Derivation(..), DerivationOutput(..))
 import System.Nix.Build (BuildMode(..), BuildStatus(..), BuildResult(..))
 import System.Nix.StorePath (StoreDir, StorePath)
 import System.Nix.Store.Remote.Serialize.Prim

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

@@ -22,9 +22,8 @@ import           Network.Socket.ByteString      ( recv
                                                 , sendAll
                                                 )
 
-import           Nix.Derivation
-
 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

hnix-store-remote/tests/SerializeSpec.hs

@@ -20,9 +20,8 @@ import qualified Data.HashSet
 import qualified Data.Time.Clock.POSIX
 import qualified System.Nix.Build
 
-import Nix.Derivation (Derivation(..))
 import System.Nix.Build (BuildMode, BuildStatus)
-import System.Nix.Derivation ()
+import System.Nix.Derivation (Derivation(..))
 import System.Nix.StorePath (StoreDir, StorePath)
 import System.Nix.Store.Remote.Serialize (getDerivation, putDerivation)
 import System.Nix.Store.Remote.Serialize.Prim