check if typstyle exists

cachix · Jun 19, 2024 · 62e46b4 · 62e46b4
1 parent 6522d75
commit 62e46b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/modules/hooks.nix b/modules/hooks.nix
@@ -3418,7 +3418,11 @@ lib.escapeShellArgs (lib.concatMap (ext: [ "--ghc-opt" "-X${ext}" ]) hooks.ormol
         name = "typstyle";
         description = "Beautiful and reliable typst code formatter";
         packages = tools.typstyle;
-        entry = "${hooks.typstyle.package}/bin/typstyle";
+        entry =
+          lib.throwIf
+            (hooks.typstyle.package == null)
+            "The version of nixpkgs used by pre-commit-hooks.nix must contain typstyle"
+            "${hooks.typstyle.package}/bin/typstyle";
         files = "\\.typ$";
       };
       vale = {

diff --git a/nix/tools.nix b/nix/tools.nix
@@ -71,7 +71,7 @@
 , treefmt
 , typos
 , typstfmt
-, typstyle
+, typstyle ? null ## Add in nixpkgs added on commit 800ca60
 , zprint
 , yamlfmt
 , yamllint