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

remote: NixSerializer, move maybePath from where clause, expose

Browse Source
This commit is contained in:
sorki 2023-12-01 06:09:08 +01:00
parent 936fdf85f5
commit ec79cfe1ce
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ module System.Nix.Store.Remote.Serializer
, protoVersion
-- * StorePath
, storePath
, maybePath
, storePathHashPart
, storePathName
-- * Metadata
@ -409,6 +410,27 @@ storePath = Serializer
$ System.Nix.StorePath.storePathToRawFilePath sd p
}
maybePath
:: HasStoreDir r
=> NixSerializer r SError (Maybe StorePath)
maybePath = Serializer
{ getS = do
getS maybeText >>= \case
Nothing -> pure Nothing
Just t -> do
sd <- Control.Monad.Reader.asks hasStoreDir
either
(throwError . SError_Path)
(pure . pure)
$ System.Nix.StorePath.parsePathFromText sd t
, putS = \case
Nothing -> putS maybeText Nothing
Just p -> do
sd <- Control.Monad.Reader.asks hasStoreDir
putS text $ System.Nix.StorePath.storePathToText sd p
}
storePathHashPart :: NixSerializer r SError StorePathHashPart
storePathHashPart =
mapIsoSerializer
@ -485,27 +507,6 @@ pathMetadata = Serializer
(fmap System.Nix.ContentAddress.buildContentAddress)
maybeText
maybePath
:: HasStoreDir r
=> NixSerializer r SError (Maybe StorePath)
maybePath = Serializer
{ getS = do
getS maybeText >>= \case
Nothing -> pure Nothing
Just t -> do
sd <- Control.Monad.Reader.asks hasStoreDir
either
(throwError . SError_Path)
(pure . pure)
$ System.Nix.StorePath.parsePathFromText sd t
, putS = \case
Nothing -> putS maybeText Nothing
Just p -> do
sd <- Control.Monad.Reader.asks hasStoreDir
putS text $ System.Nix.StorePath.storePathToText sd p
}
storePathTrust
:: NixSerializer r SError StorePathTrust
storePathTrust =