Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
tbidne committed Nov 19, 2024
1 parent 30377c5 commit 2ffc69d
Show file tree
Hide file tree
Showing 18 changed files with 217 additions and 137 deletions.
14 changes: 5 additions & 9 deletions app/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,9 @@ import Effects.FileSystem.HandleWriter (MonadHandleWriter (withBinaryFile), die)
import Effects.FileSystem.PathReader qualified as Dir
import Effects.FileSystem.PathWriter (MonadPathWriter)
import Effects.FileSystem.PathWriter qualified as Dir
import Effects.FileSystem.Utils
( encodeFpToOsThrowM,
encodeFpToValidOsThrowM,
osp,
)
import Effects.Time (MonadTime)
import Effects.Time qualified as Time
import FileSystem.OsPath (encodeThrowM, encodeValidThrowM)
import GHC.Conc.Sync (setUncaughtExceptionHandler)
import Navi (runNavi, runNaviT)
import Navi.Args (Args, getArgs)
Expand Down Expand Up @@ -46,7 +42,7 @@ main = do
args <- getArgs
config <-
tryParseConfig args
`catchAny` writeConfigErr
`catchSync` writeConfigErr

withLogEnv (config ^. #logging) $ \logEnv -> do
let mkNaviEnv :: (LogEnv -> Config -> IO env) -> IO env
Expand Down Expand Up @@ -121,7 +117,7 @@ withLogHandle logging onMHandle = do
handleLogSize xdgState sizeMode

currTimeOs <-
encodeFpToValidOsThrowM
encodeValidThrowM
. fmap replaceSpc
=<< Time.getSystemTimeString
let logFile = xdgState </> currTimeOs <> [osp|.log|]
Expand Down Expand Up @@ -152,7 +148,7 @@ writeConfigErr ex = do
let logFile = xdgBase </> [osp|config_fatal.log|]
renameIfExists logFile
writeFileUtf8 logFile $ "Couldn't read config: " <> pack (displayException ex)
throwCS ex
throwM ex

renameIfExists ::
( HasCallStack,
Expand Down Expand Up @@ -184,7 +180,7 @@ uniqName fp = go 1
go !counter
| counter == maxBound = die $ "Failed renaming file: " <> show fp
| otherwise = do
fp' <- (fp <>) <$> encodeFpToOsThrowM (show counter)
fp' <- (fp <>) <$> encodeThrowM (show counter)
b <- Dir.doesFileExist fp'
if b
then go (counter + 1)
Expand Down
35 changes: 16 additions & 19 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,24 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/tbidne/bounds.git
tag: f93b202c9d154b25b42b048570cf6648451aa577
tag: fb05a7288020d2bca0dbe45cd43d2c030f5a238c

source-repository-package
type: git
location: https://github.com/tbidne/exception-utils.git
tag: 9ecb81e4a16f62736dbe7f90cb1983e7212b0c0f

source-repository-package
type: git
location: https://github.com/tbidne/fs-utils.git
tag: 3fc40b75e89af85f9babf315a977ab17dc331495

source-repository-package
type: git
location: https://github.com/tbidne/monad-effects.git
tag: f3496c0d2606540498d6fd503e6855441ca03ee1
tag: 32ec7ad8b875360fda8230969c0ab5a30ede17aa
subdir:
lib/effects-env
lib/effects-exceptions
lib/effects-async
lib/effects-fs
lib/effects-ioref
Expand All @@ -56,7 +65,7 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/tbidne/pythia.git
tag: 9b29afe578ca58f57b4a8278db2175fbdc3588e8
tag: 9ad009184281b0f206160d385cc4aceca6efa1bd

source-repository-package
type: git
Expand All @@ -66,31 +75,19 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/tbidne/si-bytes.git
tag: 308faf0ab25b39e0dda8de23d5d315e82260080f
tag: 8132d4c7ab1109b2818832bae13eccff398f7aa3

source-repository-package
type: git
location: https://github.com/tbidne/smart-math.git
tag: 9bd570201445904d12d0e0b792f171d02e6f361e
tag: d07ba621a076416f2724bb8876a4d3ad7ed8a10e

source-repository-package
type: git
location: https://github.com/tbidne/time-conv.git
tag: 0d1581593a484ac5717c0b5c3965f5ca54605cdb
tag: 971a560f3ccfd7d8ea974affa85492f91713359c

allow-newer: aeson:th-abstraction
allow-newer: dbus:template-haskell
allow-newer: hedgehog:template-haskell
allow-newer: tasty-hedgehog:base

--allow-newer: dbus:template-haskell
--allow-newer: dbus:transformers
--allow-newer: dbus:unix
--allow-newer: these-skinny:base
--allow-newer: refined:aeson
--allow-newer: refined:base
--allow-newer: refined:bytestring
--allow-newer: refined:deepseq
--allow-newer: refined:mtl
--allow-newer: refined:template-haskell
--allow-newer: refined:text
134 changes: 103 additions & 31 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2ffc69d

Please sign in to comment.