From 63fd7be9c6082d294a2d202572955a3845092529 Mon Sep 17 00:00:00 2001
From: Stevan Andjelkovic <stevan.andjelkovic@symbiont.io>
Date: Thu, 11 Feb 2021 11:05:24 +0100
Subject: [PATCH] nix(ldfi2): add stylish-haskell and cabal-fmt

---
 shell.nix            |  4 +++
 src/ldfi2/ldfi.cabal | 72 +++++++++++++++++++++++++-------------------
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/shell.nix b/shell.nix
index 44f2607c..3a791a78 100644
--- a/shell.nix
+++ b/shell.nix
@@ -28,6 +28,10 @@ pkgs.mkShell {
     haskellPackages.ghc
     haskellPackages.cabal-install
     haskellPackages.tasty-discover
+    haskellPackages.cabal-fmt       # For formatting .cabal files, example
+                                    # invocation: `cabal-fmt -i ldfi.cabal`.
+    haskellPackages.stylish-haskell # For import statement formatting, can be
+                                    # invoked from spacemacs via `, F`.
     z3
 
     git
diff --git a/src/ldfi2/ldfi.cabal b/src/ldfi2/ldfi.cabal
index 4976389c..00da1ecd 100644
--- a/src/ldfi2/ldfi.cabal
+++ b/src/ldfi2/ldfi.cabal
@@ -1,36 +1,44 @@
-cabal-version:       >=1.10
-name:                ldfi
-version:             0.0.0
-synopsis:            Lineage-driven fault injection
-description:         See README at <https://github.com/symbiont-io/detsys-testkit/tree/main/src/ldfi#readme>
-bug-reports:         https://github.com/symbiont-io/detsys-testkit/issues
-license:             AllRightsReserved
-license-file:        LICENSE
-author:              Stevan Andjelkovic
-maintainer:          symbiont-stevan-andjelkovic@users.noreply.github.com
-copyright:           Copyright (c) 2021 Symbiont Inc
-category:            Testing, Distributed Systems
-build-type:          Simple
-extra-source-files:  CHANGELOG.md
-tested-with:         GHC ==8.10.3
+cabal-version:      >=1.10
+name:               ldfi
+version:            0.0.0
+synopsis:           Lineage-driven fault injection
+description:
+  See README at <https://github.com/symbiont-io/detsys-testkit/tree/main/src/ldfi#readme>
+
+bug-reports:        https://github.com/symbiont-io/detsys-testkit/issues
+license:            AllRightsReserved
+license-file:       LICENSE
+author:             Stevan Andjelkovic
+maintainer:         symbiont-stevan-andjelkovic@users.noreply.github.com
+copyright:          Copyright (c) 2021 Symbiont Inc
+category:           Testing, Distributed Systems
+build-type:         Simple
+extra-source-files: CHANGELOG.md
+tested-with:        GHC ==8.10.3
 
 library
-  hs-source-dirs:    src/
-  exposed-modules:   Ldfi
+  hs-source-dirs:   src/
+  exposed-modules:
+    Ldfi
+    Ldfi.Storage
+
   -- GHC boot library dependencies:
   -- (https://gitlab.haskell.org/ghc/ghc/-/blob/master/packages)
   build-depends:
-      base           >=4.14 && <4.15
+      base        >=4.14 && <4.15
     , containers
+    , githash
+    , mtl
+    , sqlite-simple
+
   -- Other dependencies:
-  build-depends:
-      z3
-  default-language:  Haskell2010
+  build-depends:    z3
+  default-language: Haskell2010
 
 test-suite test
-  type:              exitcode-stdio-1.0
-  hs-source-dirs:    test/
-  main-is:           Main.hs
+  type:             exitcode-stdio-1.0
+  hs-source-dirs:   test/
+  main-is:          Main.hs
   build-depends:
       base
     , containers
@@ -38,21 +46,23 @@ test-suite test
     , ldfi
     , tasty
     , tasty-hunit
-  build-depends:
-    z3
+
+  build-depends:    z3
   other-modules:
     Driver
     LdfiTest
-  ghc-options:       -threaded -rtsopts -with-rtsopts=-N -fno-ignore-asserts
-  default-language:  Haskell2010
+
+  ghc-options:      -threaded -rtsopts -with-rtsopts=-N -fno-ignore-asserts
+  default-language: Haskell2010
 
 executable ldfi
-  hs-source-dirs:    app/
-  main-is:           Main.hs
+  hs-source-dirs:   app/
+  main-is:          Main.hs
   build-depends:
       base
     , ldfi
-  default-language:  Haskell2010
+
+  default-language: Haskell2010
 
 source-repository head
   type:     git