haskell-nix/hnix-store
1
1
Fork 0
mirror of https://github.com/haskell-nix/hnix-store.git synced 2024-09-11 18:05:56 +03:00
Code Issues Projects Releases Wiki Activity

remote: align AddToStore and AddTextToStore serializers with old versions

Browse Source
This commit is contained in:
sorki 2023-12-03 12:07:38 +01:00
parent 9b66373471
commit 11a9bfffd0
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hnix-store-remote/src/System/Nix/Store/Remote/Serializer.hs
View File

@ -117,8 +117,9 @@ import System.Nix.Build (BuildMode, BuildResult(..))
import System.Nix.ContentAddress (ContentAddress)
import System.Nix.Derivation (Derivation(..), DerivationOutput(..))
import System.Nix.DerivedPath (DerivedPath, ParseOutputsError)
import System.Nix.Hash (HashAlgo)
import System.Nix.Hash (HashAlgo(..))
import System.Nix.Signature (Signature, NarSignature)
import System.Nix.Store.Types (FileIngestionMethod(..), RepairMode(..))
import System.Nix.StorePath (HasStoreDir(..), InvalidPathError, StorePath, StorePathHashPart, StorePathName)
import System.Nix.StorePath.Metadata (Metadata(..), StorePathTrust(..))
import System.Nix.Store.Remote.Types
@ -984,16 +985,20 @@ storeRequest = Serializer
{ getS = getS workerOp >>= \case
WorkerOp_AddToStore -> do
pathName <- getS storePathName
_fixed <- getS bool -- obsolete
recursive <- getS enum
hashAlgo <- getS someHashAlgo
repairMode <- getS enum
pure $ Some (AddToStore pathName recursive hashAlgo repairMode)
-- not supported by ProtoVersion < 1.25
let repair = RepairMode_DontRepair
pure $ Some (AddToStore pathName recursive hashAlgo repair)
WorkerOp_AddTextToStore -> do
txt <- getS storeText
paths <- getS (hashSet storePath)
repairMode <- getS enum
pure $ Some (AddTextToStore txt paths repairMode)
let repair = RepairMode_DontRepair
pure $ Some (AddTextToStore txt paths repair)
WorkerOp_AddSignatures -> do
path <- getS storePath
@ -1106,20 +1111,24 @@ storeRequest = Serializer
WorkerOp_SetOptions -> undefined
, putS = \case
Some (AddToStore pathName recursive hashAlgo repairMode) -> do
Some (AddToStore pathName recursive hashAlgo _repair) -> do
putS workerOp WorkerOp_AddToStore
putS storePathName pathName
putS enum recursive
putS someHashAlgo hashAlgo
putS enum repairMode
-- obsolete fixed
putS bool
$ not
$ hashAlgo == Some HashAlgo_SHA256
&& (recursive == FileIngestionMethod_FileRecursive)
Some (AddTextToStore txt paths repairMode) -> do
putS bool (recursive == FileIngestionMethod_FileRecursive)
putS someHashAlgo hashAlgo
Some (AddTextToStore txt paths _repair) -> do
putS workerOp WorkerOp_AddTextToStore
putS storeText txt
putS (hashSet storePath) paths
putS enum repairMode
Some (AddSignatures path signatures) -> do
putS workerOp WorkerOp_AddSignatures