Skip to content

Commit

Permalink
Update ron livarary to fix bug
Browse files Browse the repository at this point in the history
  • Loading branch information
cblp committed Nov 3, 2018
1 parent b188919 commit fb521b7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ff-core/lib/FF/Types.hs
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ import RON.Data.Internal (mkStateChunk)
import RON.Data.LWW (lwwType)
import RON.Data.RGA (RgaRaw, rgaType)
import RON.Data.Time (day)
import RON.Event (Event (Event), applicationSpecific, encodeEvent,
localEpochTimeFromUnix)
import RON.Epoch (localEpochTimeFromUnix)
import RON.Event (Event (Event), applicationSpecific, encodeEvent)
import RON.Schema (Declaration (DStructLww), StructLww (StructLww),
atomString, def, field, oaHaskellType, opaqueAtoms,
option, rgaString, saHaskellDeriving,
Expand Down
6 changes: 3 additions & 3 deletions ron-storage/RON/Storage/IO.hs
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import Data.IORef (IORef, newIORef)
import Data.Maybe (fromMaybe, listToMaybe)
import Data.Word (Word64)
import Network.Info (MAC (MAC), getNetworkInterfaces, mac)
import RON.Event (Clock, EpochClock, EpochTime, Replica, ReplicaId,
advance, applicationSpecific, getCurrentEpochTime,
getEvents, getPid, runEpochClock)
import RON.Epoch (EpochClock, getCurrentEpochTime, runEpochClock)
import RON.Event (Clock, EpochTime, Replica, ReplicaId, advance,
applicationSpecific, getEvents, getPid)
import System.Directory (createDirectoryIfMissing, doesDirectoryExist,
doesPathExist, listDirectory, removeFile,
renameDirectory)
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ extra-deps:
# ff:
- crdt-10.3
- git: https://github.com/ff-notes/ron.git
commit: '8c8cf0d'
commit: '066166a'
subdirs: [ron]

0 comments on commit fb521b7

Please sign in to comment.