move ValidPath to separate file to avoid name clashes

Author: sorki

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

@@ -27,6 +27,7 @@ library
                      , System.Nix.ReadonlyStore
                      , System.Nix.Store
                      , System.Nix.Util
+                     , System.Nix.ValidPath
   build-depends:       base >=4.10
                      , base16-bytestring
                      , bytestring

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

@@ -12,7 +12,6 @@ module System.Nix.Path
   , pathToText
   , PathSet
   , SubstitutablePathInfo(..)
-  , ValidPathInfo(..)
   , PathName(..)
   , filePathPart
   , pathName
@@ -80,37 +79,6 @@ data SubstitutablePathInfo = SubstitutablePathInfo
     narSize      :: !Integer
   } deriving (Eq, Ord, Show)
 
--- | Information about @Path@
-data ValidPathInfo = ValidPathInfo
-  { -- | Path itself
-    path             :: !Path
-  , -- | The .drv which led to this 'Path'.
-    deriverVP        :: !(Maybe Path)
-  , -- | NAR hash
-    narHash          :: !Text
-  , -- | The references of the 'Path'
-    referencesVP     :: !PathSet
-  , -- | Registration time should be time_t
-    registrationTime :: !Integer
-  , -- | The size of the uncompressed NAR serialization of this
-    -- 'Path'.
-    narSizeVP        :: !Integer
-  , -- | Whether the path is ultimately trusted, that is, it's a
-    -- derivation output that was built locally.
-    ultimate         :: !Bool
-  , -- | Signatures
-    sigs             :: ![Text]
-  , -- | Content-addressed
-    -- Store path is computed from a cryptographic hash
-    -- of the contents of the path, plus some other bits of data like
-    -- the "name" part of the path.
-    --
-    -- ‘ca’ has one of the following forms:
-    -- * ‘text:sha256:<sha256 hash of file contents>’ (paths by makeTextPath() / addTextToStore())
-    -- * ‘fixed:<r?>:<ht>:<h>’ (paths by makeFixedOutputPath() / addToStore())
-    ca               :: !Text
-  } deriving (Eq, Ord, Show)
-
 -- | A valid filename or directory name
 newtype FilePathPart = FilePathPart { unFilePathPart :: BSC.ByteString }
   deriving (Eq, Ord, Show)

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

@@ -0,0 +1,56 @@
+{-|
+Description : Types and effects for interacting with the Nix store.
+Maintainer  : Shea Levy <[email protected]>
+-}
+{-# LANGUAGE DataKinds                  #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+module System.Nix.ValidPath
+  ( ValidPath(..)
+  ) where
+
+import           System.Nix.Hash           (Digest(..),
+                                            HashAlgorithm(Truncated, SHA256))
+import           System.Nix.Path           (Path(..), PathSet)
+import qualified Data.ByteString           as BS
+import qualified Data.ByteString.Char8     as BSC
+import           Data.Hashable             (Hashable (..), hashPtrWithSalt)
+import           Data.HashMap.Strict       (HashMap)
+import           Data.HashSet              (HashSet)
+import           Data.Map.Strict           (Map)
+import           Data.Text                 (Text)
+import           Data.Time                 (UTCTime)
+import qualified Data.Text                 as T
+import           System.IO.Unsafe          (unsafeDupablePerformIO)
+import           Text.Regex.Base.RegexLike (makeRegex, matchTest)
+import           Text.Regex.TDFA.Text      (Regex)
+
+-- | Information about @Path@
+data ValidPath = ValidPath
+  { -- | Path itself
+    path             :: !Path
+  , -- | The .drv which led to this 'Path'.
+    deriver          :: !(Maybe Path)
+  , -- | NAR hash
+    narHash          :: !Text
+  , -- | The references of the 'Path'
+    references       :: !PathSet
+  , -- | Registration time
+    registrationTime :: !UTCTime
+  , -- | The size of the uncompressed NAR serialization of this
+    -- 'Path'.
+    narSize          :: !Integer
+  , -- | Whether the path is ultimately trusted, that is, it's a
+    -- derivation output that was built locally.
+    ultimate         :: !Bool
+  , -- | Signatures
+    sigs             :: ![Text]
+  , -- | Content-addressed
+    -- Store path is computed from a cryptographic hash
+    -- of the contents of the path, plus some other bits of data like
+    -- the "name" part of the path.
+    --
+    -- ‘ca’ has one of the following forms:
+    -- * ‘text:sha256:<sha256 hash of file contents>’ (paths by makeTextPath() / addTextToStore())
+    -- * ‘fixed:<r?>:<ht>:<h>’ (paths by makeFixedOutputPath() / addToStore())
+    ca               :: !Text
+  } deriving (Eq, Ord, Show)