Merge branch 'master' into cabal2nix

cachix · Dec 16, 2024 · d1cacdd · d1cacdd
2 parents 3e13b67 + aa9f40c
commit d1cacdd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/modules/hooks.nix b/modules/hooks.nix
@@ -2052,6 +2052,7 @@ in
           package = tools.cabal2nix-dir;
           entry = "${hooks.cabal2nix.package}/bin/cabal2nix-dir --outputFileName=${hooks.cabal2nix.settings.output_filename}";
           files = "\\.cabal$";
+          after = [ "hpack" ];
         };
       cargo-check =
         {

diff --git a/modules/pre-commit.nix b/modules/pre-commit.nix
@@ -9,6 +9,7 @@ let
     mapAttrsToList
     mkOption
     types
+    removeAttrs
     remove
     ;
 
@@ -43,8 +44,15 @@ let
           )
           enabledHooks
         );
+      cleanedHooks = builtins.map (
+        hook:
+        removeAttrs hook [
+          "before"
+          "after"
+        ]
+      ) sortedHooks.result;
     in
-    sortedHooks.result;
+    cleanedHooks;
 
   configFile =
     performAssertions (

diff --git a/nix/tools.nix b/nix/tools.nix
@@ -11,7 +11,7 @@
 , callPackage
 , cargo
 , checkmake
-, clang-tools
+, llvmPackages_latest
 , clippy
 , cljfmt
 , cmake-format
@@ -96,6 +96,7 @@ let
   };
 in
 {
+  clang-tools = llvmPackages_latest.clang-tools;
   inherit
     actionlint
     alejandra
@@ -106,7 +107,6 @@ in
     cabal-fmt
     cabal-gild
     cargo
-    clang-tools
     clippy
     cljfmt
     cmake-format