[Leios Prototype] Cleanup

cabal.project

@@ -90,8 +90,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/cardano-ledger.git
-  tag: 7e1fb14c916e58709aa36c4b4fe0265ba537e0f0
-  --sha256: sha256-nR60TiNlCaeutZNI083hdjM3HqglM9sGWqf6MFKaK1I=
+  tag: 0c0368ea767e0dcbe187d44a9ab2d8a16d826984
+  --sha256: sha256-8gt+Y5eVmK7S/j784eXywRXkm2YR4fJyI5vz4a5Uv9g=
   subdir:
     eras/allegra/impl
     eras/alonzo/impl

flake.nix

@@ -95,10 +95,8 @@
         } // leiosDemo.devShells;
         inherit hydraJobs;
         legacyPackages = pkgs;
-        packages =
-          hydraJobs.native.haskell96.exesNoAsserts.ouroboros-consensus-cardano // {
-            leios-mvd-test = pkgs.testers.nixosTest (import ./nix/leios-mvd/test.nix { inherit inputs pkgs; });
-          };
+        formatter = hydraJobs.native.formattingLinting.run;
+        packages = hydraJobs.native.haskell96.exesNoAsserts.ouroboros-consensus-cardano;
       }
     );
 }

nix/formatting-linting.nix

@@ -2,6 +2,13 @@ pkgs:
 
 let
   inherit (pkgs) lib;
+
+  runFormatting = tool: script: pkgs.writeShellApplication {
+    name = "run-${lib.getName tool}";
+    runtimeInputs = [ pkgs.bash pkgs.fd tool ];
+    text = ''bash ${script}'';
+  };
+
   checkFormatting = tool: script: pkgs.runCommand
     "check-${lib.getName tool}"
     {
@@ -24,7 +31,8 @@ let
       echo $EXIT_CODE > $out
     fi
   '';
-  formattingLinting = {
+
+  checks = {
     fourmolu = checkFormatting pkgs.fourmolu ../scripts/ci/run-fourmolu.sh;
     cabal-gild = checkFormatting pkgs.cabal-gild ../scripts/ci/run-cabal-gild.sh;
     nixpkgs-fmt = checkFormatting pkgs.nixpkgs-fmt ../scripts/ci/run-nixpkgs-fmt.sh;
@@ -42,11 +50,32 @@ let
       touch $out
     '';
   };
-in
-formattingLinting // {
-  all = pkgs.releaseTools.aggregate {
-    name = "consensus-formatting";
-    meta.description = "Run all formatters and linters";
-    constituents = lib.collect lib.isDerivation formattingLinting;
+
+  runs = {
+    fourmolu = runFormatting pkgs.fourmolu ../scripts/ci/run-fourmolu.sh;
+    cabal-gild = runFormatting pkgs.cabal-gild ../scripts/ci/run-cabal-gild.sh;
+    nixpkgs-fmt = runFormatting pkgs.nixpkgs-fmt ../scripts/ci/run-nixpkgs-fmt.sh;
+    dos2unix = runFormatting pkgs.dos2unix ../scripts/ci/run-dos2unix.sh;
+    hlint = pkgs.writeShellApplication {
+      name = "hlint";
+      runtimeInputs = [ pkgs.hlint ];
+      text = ''hlint -j .'';
+    };
   };
+
+  checkAll = pkgs.releaseTools.aggregate {
+    name = "consensus-formatting-check";
+    meta.description = "Check all formatters and linters";
+    constituents = lib.collect lib.isDerivation checks;
+  };
+
+  runAll = pkgs.writeShellApplication {
+    name = "consensus-formatting-run";
+    text = ''for prog in ${with builtins; toString (map lib.getExe (attrValues runs))}; do $prog; done'';
+  };
+
+in
+checks // {
+  all = checkAll;
+  run = runAll;
 }