Extract nix/tools.nix

cachix · Oct 1, 2019 · b9957b5 · b9957b5
1 parent 7a39851
commit b9957b5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/modules/pre-commit.nix b/modules/pre-commit.nix
@@ -206,6 +206,11 @@ in {
 
               nix-pre-commit comes with its own set of packages for this purpose.
             '';
+          # This default is for when the module is the entry point rather than
+          # /default.nix. /default.nix will override this for efficiency.
+          default = (import ../nix {}).callPackage ../nix/tools.nix {};
+          defaultText =
+            literalExample ''nix-pre-commit-hooks-pkgs.callPackage tools-dot-nix {}'';
         };
 
       hooks =

diff --git a/nix/packages.nix b/nix/packages.nix
@@ -1,15 +1,7 @@
-{ hlint, shellcheck, ormolu, hindent, cabal-fmt, canonix, elmPackages, niv
-, gitAndTools, runCommand, writeText, writeScript, git, nixpkgs-fmt, nixfmt
-, callPackage
-}:
+{ niv, gitAndTools, callPackage }:
 
 let
-  tools =
-    {
-      inherit hlint shellcheck ormolu hindent cabal-fmt canonix nixpkgs-fmt nixfmt;
-      inherit (elmPackages) elm-format;
-      terraform-fmt = callPackage ./terraform-fmt {};
-    };
+  tools = callPackage ./tools.nix {};
 in
   tools // rec {
   inherit niv;

diff --git a/nix/tools.nix b/nix/tools.nix
@@ -0,0 +1,10 @@
+{ hlint, shellcheck, ormolu, hindent, cabal-fmt, canonix, elmPackages, niv
+, gitAndTools, runCommand, writeText, writeScript, git, nixpkgs-fmt, nixfmt
+, callPackage
+}:
+
+{
+  inherit hlint shellcheck ormolu hindent cabal-fmt canonix nixpkgs-fmt nixfmt;
+  inherit (elmPackages) elm-format;
+  terraform-fmt = callPackage ./terraform-fmt {};
+}