Merge pull request cachix#426 from cachix/fix-default-package

Set the default hook package to null
phip1611 · Apr 8, 2024 · 70f5040 · 70f5040
2 parents e35aed5 + 6c2316d
commit 70f5040
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/modules/hook.nix b/modules/hook.nix
@@ -46,6 +46,7 @@ in
 
     package = mkOption {
       type = types.nullOr types.package;
+      default = null;
       description = lib.mdDoc
         ''
           An optional package that provides the hook.

diff --git a/modules/pre-commit.nix b/modules/pre-commit.nix
@@ -138,7 +138,7 @@ in
             Useful for including into the developer environment.
           '';
 
-        default = builtins.map (hook: hook.package) (lib.filter (hook: hook.enable) (builtins.attrValues config.hooks));
+        default = builtins.map (hook: hook.package) (lib.filter (hook: hook.enable && hook.package != null) (builtins.attrValues config.hooks));
       };
 
       hooks =
-Original file line number
+Diff line change
@@ Expand Up / @@ -138,7 +138,7 @@ in @@
                 Useful for including into the developer environment.
               '';
-            default = builtins.map (hook: hook.package) (lib.filter (hook: hook.enable) (builtins.attrValues config.hooks));
+            default = builtins.map (hook: hook.package) (lib.filter (hook: hook.enable && hook.package != null) (builtins.attrValues config.hooks));
           };
           hooks =
@@ Expand Down @@