cabal: dep: hnix-store-{core,remote} (0.4->0.5)

For simplicity (& because we are already in massive breackage) chosen to just
migrate to 0.5.

HNix currently winded-up wih 2 hashing packages, but what to choose would be
seen further down the line, it is smart to postphone in this case.

Author: Anton-Latukha

default.nix

@@ -192,6 +192,8 @@ let
 
       semialign = super.semialign_1_2;
       relude = super.relude_1_0_0_1;
+      hnix-store-core = super.hnix-store-core_0_5_0_0;
+      hnix-store-remote = super.hnix-store-remote_0_5_0_0;
 
     };
 

hnix.cabal

@@ -410,6 +410,7 @@ library
     , base16-bytestring >= 0.1.1 && < 1.1
     , binary >= 0.8.5 && < 0.9
     , bytestring >= 0.10.8 && < 0.12
+    , cryptonite
     , comonad >= 5.0.4 && < 5.1
     , containers >= 0.5.11.0 && < 0.7
     , data-fix >= 0.3.0 && < 0.4
@@ -422,8 +423,8 @@ library
     , gitrev >= 1.1.0 && < 1.4
     , hashable >= 1.2.5 && < 1.4
     , hashing >= 0.1.0 && < 0.2
-    , hnix-store-core >= 0.4.0 && < 0.5
-    , hnix-store-remote >= 0.4.0 && < 0.5
+    , hnix-store-core >= 0.5.0 && < 0.6
+    , hnix-store-remote >= 0.5.0 && < 0.6
     , http-client >= 0.5.14 && < 0.6 || >= 0.6.4 && < 0.8
     , http-client-tls >= 0.3.5 && < 0.4
     , http-types >= 0.12.2 && < 0.13

src/Nix/Builtins.hs

@@ -12,6 +12,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE ViewPatterns #-}
+{-# LANGUAGE PackageImports #-} -- 2021-07-05: Due to hashing Haskell IT system situation, in HNix we currently ended-up with 2 hash package dependencies @{hashing, cryptonite}@
 
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 
@@ -30,11 +31,11 @@ import           Control.Comonad                ( Comonad )
 import           Control.Monad                  ( foldM )
 import           Control.Monad.Catch            ( MonadCatch(catch) )
 import           Control.Monad.ListM            ( sortByM )
-import           Crypto.Hash
-import qualified Crypto.Hash.MD5               as MD5
-import qualified Crypto.Hash.SHA1              as SHA1
-import qualified Crypto.Hash.SHA256            as SHA256
-import qualified Crypto.Hash.SHA512            as SHA512
+import           "hashing" Crypto.Hash
+import qualified "hashing" Crypto.Hash.MD5     as MD5
+import qualified "hashing" Crypto.Hash.SHA1    as SHA1
+import qualified "hashing" Crypto.Hash.SHA256  as SHA256
+import qualified "hashing" Crypto.Hash.SHA512  as SHA512
 import qualified Data.Aeson                    as A
 import           Data.Align                     ( alignWith )
 import           Data.Array

src/Nix/Effects.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE PackageImports #-} -- 2021-07-05: Due to hashing Haskell IT system situation, in HNix we currently ended-up with 2 hash package dependencies @{hashing, cryptonite}@
 
 {-# OPTIONS_GHC -Wno-orphans #-}
 
@@ -23,6 +24,7 @@ import qualified Data.Text                     as Text
 import           Network.HTTP.Client     hiding ( path, Proxy )
 import           Network.HTTP.Client.TLS
 import           Network.HTTP.Types
+import qualified "cryptonite" Crypto.Hash      as Hash
 import           Nix.Utils.Fix1
 import           Nix.Expr
 import           Nix.Frames              hiding ( Proxy )
@@ -36,7 +38,6 @@ import           System.FilePath                ( takeFileName )
 import qualified System.Info
 import           System.Process
 
-import qualified System.Nix.Hash               as Store
 import qualified System.Nix.Store.Remote       as Store.Remote
 import qualified System.Nix.StorePath          as Store
 
@@ -402,7 +403,7 @@ instance MonadStore IO where
       (\ pathName ->
         do
           -- TODO: redesign the filter parameter
-          res <- Store.Remote.runStore $ Store.Remote.addToStore @'Store.SHA256 pathName path recursive (const False) repair
+          res <- Store.Remote.runStore $ Store.Remote.addToStore @Hash.SHA256 pathName path recursive (const False) repair
           either
             Left -- err
             (pure . StorePath . decodeUtf8 . Store.storePathToRawFilePath) -- store path

src/Nix/Effects/Derivation.hs

@@ -2,7 +2,7 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-
+{-# LANGUAGE PackageImports #-} -- 2021-07-05: Due to hashing Haskell IT system situation, in HNix we currently ended-up with 2 hash package dependencies @{hashing, cryptonite}@
 
 module Nix.Effects.Derivation ( defaultDerivationStrict ) where
 
@@ -18,6 +18,11 @@ import qualified Data.Map.Strict               as Map
 import qualified Data.Set                      as Set
 import qualified Data.Text                     as Text
 
+import           Text.Megaparsec
+import           Text.Megaparsec.Char
+
+import qualified "cryptonite" Crypto.Hash      as Hash -- 2021-07-05: Attrocity of Haskell hashing situation, in HNix we ended-up with 2 hash package dependencies @{hashing, cryptonite}@
+
 import           Nix.Atoms
 import           Nix.Convert
 import           Nix.Effects
@@ -35,9 +40,6 @@ import           Nix.Value.Monad
 import qualified System.Nix.ReadonlyStore      as Store
 import qualified System.Nix.Hash               as Store
 import qualified System.Nix.StorePath          as Store
-
-import           Text.Megaparsec
-import           Text.Megaparsec.Char
 import Prelude hiding (readFile)
 
 
@@ -77,21 +79,21 @@ writeDerivation drv@Derivation{inputs, name} = do
 
 -- | Traverse the graph of inputDrvs to replace fixed output derivations with their fixed output hash.
 -- this avoids propagating changes to their .drv when the output hash stays the same.
-hashDerivationModulo :: (MonadNix e t f m, MonadState (b, AttrSet Text) m) => Derivation -> m (Store.Digest 'Store.SHA256)
+hashDerivationModulo :: (MonadNix e t f m, MonadState (b, AttrSet Text) m) => Derivation -> m (Hash.Digest Hash.SHA256)
 hashDerivationModulo
   Derivation
-    { mFixed = Just (Store.SomeDigest (digest :: Store.Digest hashType))
+    { mFixed = Just (Store.SomeDigest (digest :: Hash.Digest hashType))
     , outputs
     , hashMode
     } =
   case Map.toList outputs of
     [("out", path)] -> pure $
-      Store.hash @'Store.SHA256 $
+      Hash.hash @ByteString @Hash.SHA256 $
         encodeUtf8 $
           "fixed:out"
           <> (if hashMode == Recursive then ":r" else "")
           <> ":" <> (Store.algoName @hashType)
-          <> ":" <> Store.encodeInBase Store.Base16 digest
+          <> ":" <> Store.encodeDigestWith Store.Base16 digest
           <> ":" <> path
     _outputsList -> throwError $ ErrorCall $ "This is weird. A fixed output drv should only have one output named 'out'. Got " <> show _outputsList
 hashDerivationModulo
@@ -109,14 +111,14 @@ hashDerivationModulo
             maybe
               (do
                 drv' <- readDerivation $ toString path
-                hash <- Store.encodeInBase Store.Base16 <$> hashDerivationModulo drv'
+                hash <- Store.encodeDigestWith Store.Base16 <$> hashDerivationModulo drv'
                 pure (hash, outs)
               )
               (\ hash -> pure (hash, outs))
               (M.lookup path cache)
           )
           (Map.toList inputDrvs)
-    pure $ Store.hash @'Store.SHA256 $ encodeUtf8 $ unparseDrv (drv {inputs = (inputSrcs, inputsModulo)})
+    pure $ Hash.hash @ByteString @Hash.SHA256 $ encodeUtf8 $ unparseDrv $ drv {inputs = (inputSrcs, inputsModulo)}
 
 unparseDrv :: Derivation -> Text
 unparseDrv Derivation{..} =
@@ -146,8 +148,8 @@ unparseDrv Derivation{..} =
       parens $ (s <$>) $ ([outputName, outputPath] <>) $
         maybe
           [mempty, mempty]
-          (\ (Store.SomeDigest (digest :: Store.Digest hashType)) ->
-            [prefix <> Store.algoName @hashType, Store.encodeInBase Store.Base16 digest]
+          (\ (Store.SomeDigest (digest :: Hash.Digest hashType)) ->
+            [prefix <> Store.algoName @hashType, Store.encodeDigestWith Store.Base16 digest]
           )
           mFixed
     parens :: [Text] -> Text
@@ -279,7 +281,7 @@ defaultDerivationStrict val = do
     drvPath <- pathToText <$> writeDerivation drv'
 
     -- Memoize here, as it may be our last chance in case of readonly stores.
-    drvHash <- Store.encodeInBase Store.Base16 <$> hashDerivationModulo drv'
+    drvHash <- Store.encodeDigestWith Store.Base16 <$> hashDerivationModulo drv'
     modify $ second $ MS.insert drvPath drvHash
 
     let