Add a number of NFData instances

Author: Ericson2314

hnix-store-core/CHANGELOG.md

@@ -13,6 +13,15 @@
    * `OutputName.unOutputName` now returns `StorePathName` instead of `Text`
    * `DerivedPath_Built` constructor now takes `SingleDerivedPath` instead of `StorePath`
 
+* New type class instances:
+  * `NFData ContentAddressMethod`
+  * `NFData (HashAlgo a)`
+  * `GNFData HashAlgo`
+  * `NFData OutputName`
+  * `NFData StorePath`
+  * `NFData StorePathName`
+  * `NFData StorePathHashPart`
+
 # [0.8.0.0](https://github.com/haskell-nix/hnix-store/compare/core-0.7.0.0...core-0.8.0.0) 2024-07-31
 
 * Changes:

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

@@ -87,6 +87,7 @@ library
     , containers
     , crypton
     , data-default-class
+    , deepseq
     , dependent-sum > 0.7
     , dependent-sum-template >= 0.2.0.1 && < 0.3
     , filepath

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

@@ -12,6 +12,7 @@ module System.Nix.ContentAddress (
   ) where
 
 import Control.Applicative
+import Control.DeepSeq (NFData)
 import Crypto.Hash (Digest)
 import Data.Attoparsec.Text (Parser)
 import Data.Attoparsec.Text qualified
@@ -48,6 +49,8 @@ textToMethod = \case
   "text" -> Right ContentAddressMethod_Text
   name -> Left $ "Unknown store object content-addressing method " <> Data.Text.unpack name
 
+instance NFData ContentAddressMethod
+
 -- | An address for a content-addressable store path, i.e. one whose
 -- store path hash is purely a function of its contents (as opposed to
 -- paths that are derivation outputs, whose hashes are a function of

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

@@ -25,12 +25,14 @@ module System.Nix.Hash
   , digestBuilder
   ) where
 
+import Control.DeepSeq (NFData(..))
 import Crypto.Hash (Digest, HashAlgorithm, MD5(..), SHA1(..), SHA256(..), SHA512(..))
 import Data.ByteString (ByteString)
 import Data.Constraint.Extras (Has(has))
 import Data.Constraint.Extras.TH (deriveArgDict)
 import Data.Dependent.Sum (DSum((:=>)))
 import Data.GADT.Compare.TH (deriveGEq, deriveGCompare)
+import Data.GADT.DeepSeq (GNFData(..))
 import Data.GADT.Show.TH (deriveGShow)
 import Data.Kind (Type)
 import Data.Some (Some(Some))
@@ -73,6 +75,16 @@ deriveGCompare ''HashAlgo
 deriveGShow ''HashAlgo
 deriveArgDict ''HashAlgo
 
+instance NFData (HashAlgo a) where
+  rnf = \case
+    HashAlgo_MD5 -> ()
+    HashAlgo_SHA1 -> ()
+    HashAlgo_SHA256 -> ()
+    HashAlgo_SHA512 -> ()
+
+instance GNFData HashAlgo where
+  grnf = rnf
+
 algoToText :: forall t. HashAlgo t -> Text
 algoToText x = has @NamedAlgo x (algoName @t)
 

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

@@ -12,6 +12,7 @@ module System.Nix.OutputName
   , System.Nix.StorePath.InvalidNameError(..)
   ) where
 
+import Control.DeepSeq (NFData)
 import Data.Hashable (Hashable)
 import Data.Text (Text)
 import GHC.Generics (Generic)
@@ -29,6 +30,8 @@ newtype OutputName = OutputName
     unOutputName :: StorePathName
   } deriving (Eq, Generic, Hashable, Ord, Show)
 
+instance NFData OutputName
+
 mkOutputName :: Text -> Either InvalidNameError OutputName
 mkOutputName = fmap OutputName . System.Nix.StorePath.mkStorePathName
 

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

@@ -42,6 +42,7 @@ module System.Nix.StorePath
   , unsafeMakeStorePathHashPart
   ) where
 
+import Control.DeepSeq (NFData)
 import Crypto.Hash (HashAlgorithm)
 import Data.Attoparsec.Text.Lazy (Parser, (<?>))
 import Data.ByteString (ByteString)
@@ -82,6 +83,8 @@ data StorePath = StorePath
   }
   deriving (Eq, Generic, Ord)
 
+instance NFData StorePath
+
 instance Hashable StorePath where
   hashWithSalt s StorePath{..} =
     s `hashWithSalt` storePathHash `hashWithSalt` storePathName
@@ -102,13 +105,17 @@ newtype StorePathName = StorePathName
     unStorePathName :: Text
   } deriving (Eq, Generic, Hashable, Ord, Show)
 
+instance NFData StorePathName
+
 -- | The hash algorithm used for store path hashes.
 newtype StorePathHashPart = StorePathHashPart
   { -- | Extract the contents of the hash.
     unStorePathHashPart :: ByteString
   }
   deriving (Eq, Generic, Hashable, Ord, Show)
 
+instance NFData StorePathHashPart
+
 -- | Make @StorePathHashPart@ from @ByteString@ (hash part of the @StorePath@)
 -- using specific @HashAlgorithm@
 mkStorePathHashPart