Fixed data file location bugs in cabal files (#395)

* Switched to system temporary directory, for nix compatibility
* Added missing data files to ouroboros-leios-sim.cabal
* Updated logbook

Fixes #368

Author: bwbush

Logbook.md

@@ -1,5 +1,11 @@
 # Leios logbook
 
+## 2025-06-09
+
+### Fixes to CI
+
+Outstanding bugs in the CI, [#368](https://github.com/input-output-hk/ouroboros-leios/issues/368) and [#379](https://github.com/input-output-hk/ouroboros-leios/issues/379), have been fixes, so now all of the CI checks pass!
+
 ## 2025-06-06
 
 ### Formal methods

nix/project.nix

@@ -53,10 +53,8 @@ let
       # modules = [{ packages = { }; } { packages = { }; } ];
     });
 
-
   cabalProject = cabalProject'.appendOverlays [ ];
 
-
   # Docs for mkHaskellProject: https://github.com/input-output-hk/iogx/blob/main/doc/api.md#mkhaskellproject
   project = lib.iogx.mkHaskellProject {
     inherit cabalProject;

simulation/ouroboros-leios-sim.cabal

@@ -20,8 +20,10 @@ maintainer:         [email protected]
 build-type:         Simple
 extra-source-files: CHANGELOG.md
 data-files:
+  test/data/BenchTopology/topology-dense-52.json
   test/data/BenchTopology/topology-dense-52.json
   test/data/BenchTopology/latency.sqlite3.gz
+  test/data/simulation/config.default.yaml
 
 flag perf
   description: Ghc options for improved performance, disables asserts.

simulation/src/Topology.hs

@@ -70,9 +70,9 @@ import ModelTCP (Bytes, kilobytes)
 import P2P (Latency, Link, Link' (..), P2PTopography (..), P2PTopographyCharacteristics (..), genArbitraryP2PTopography, pattern (:<-))
 import SimTypes (NodeId (..), NumCores (..), Path (..), Point (..), StakeFraction (StakeFraction), World (..), WorldDimensions)
 import System.Exit (exitFailure)
-import System.FilePath (dropExtension, takeDirectory, takeExtension, takeExtensions, takeFileName)
+import System.FilePath (dropExtension, takeExtension, takeExtensions, takeFileName)
 import System.IO (hClose, hPutStrLn, stderr)
-import System.IO.Temp (withTempFile)
+import System.IO.Temp (withSystemTempFile)
 import System.Random (RandomGen)
 import Text.Printf (printf)
 
@@ -563,9 +563,8 @@ readLatencies topology latencyFile =
 readLatenciesSqlite3Gz :: BenchTopology -> FilePath -> IO LatenciesMs
 readLatenciesSqlite3Gz topology latencySqliteGzFile =
   assert (takeExtension latencySqliteGzFile == ".gz") $ do
-    let latencySqliteDirectory = takeDirectory latencySqliteGzFile
     let latencySqliteFileName = takeFileName (dropExtension latencySqliteGzFile)
-    withTempFile latencySqliteDirectory latencySqliteFileName $ \latencySqliteFile latencySqliteHandle -> do
+    withSystemTempFile latencySqliteFileName $ \latencySqliteFile latencySqliteHandle -> do
       latencySqliteGzContent <- BSL.readFile latencySqliteGzFile
       let latencySqliteContent = GZip.decompress latencySqliteGzContent
       BSL.hPut latencySqliteHandle latencySqliteContent