haskell-nix/hnix-store
1
1
Fork 0
mirror of https://github.com/haskell-nix/hnix-store.git synced 2024-12-14 10:42:10 +03:00
Code Issues Projects Releases Wiki Activity

treewide: use ask{,s}

Browse Source
This commit is contained in:
Anton-Latukha 2021-08-06 18:19:04 +03:00
parent 54a7c92791
commit f27d5c15be
No known key found for this signature in database
GPG Key ID: 3D84C07E91802E41
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hnix-store-core/src/System/Nix/Internal/Nar/Parser.hs
View File

@ -232,11 +232,11 @@ parseFile = do
pure $ Just chunk
target <- currentFile
streamFile <- Reader.asks Nar.narStreamFile
streamFile <- asks Nar.narStreamFile
Trans.lift (streamFile target getChunk)
when (s == "executable") $ do
effs :: Nar.NarEffects m <- Reader.ask
effs :: Nar.NarEffects m <- ask
Trans.lift $ do
p <- Nar.narGetPerms effs target
Nar.narSetPerms effs target (p { Directory.executable = True })
@ -248,7 +248,7 @@ parseFile = do
-- handles for target files longer than needed
parseDirectory :: (IO.MonadIO m, Fail.MonadFail m) => NarParser m ()
parseDirectory = do
createDirectory <- Reader.asks Nar.narCreateDir
createDirectory <- asks Nar.narCreateDir
target <- currentFile
Trans.lift $ createDirectory target
parseEntryOrFinish
@ -375,7 +375,7 @@ parens act = do
-- (Targets must be created before the links that target them)
createLinks :: IO.MonadIO m => NarParser m ()
createLinks = do
createLink <- Reader.asks Nar.narCreateLink
createLink <- asks Nar.narCreateLink
allLinks <- State.gets links
sortedLinks <- IO.liftIO $ sortLinksIO allLinks
forM_ sortedLinks $ \li -> do