about summary refs log tree commit diff
path: root/nix
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2022-08-06 12:50:56 -0700
committerFranck Cuny <franck@fcuny.net>2022-08-06 13:01:23 -0700
commit1db8ba6f4b4b6120702845027604d5da598a991e (patch)
tree53f26407de4e241e42de8a15dc5f6a72038b70ee /nix
parentref(ci): delete custom scripts for formatting (diff)
downloadworld-1db8ba6f4b4b6120702845027604d5da598a991e.tar.gz
ref(tools): simplify the import of tools
In the `mkSystem` function, instead of defining each tools, let's import
all of them at once. This works both with installing a tool from a
module or running them from the CLI.

Change-Id: Ia44ff9a45b54a1ecea6f6b02b4cad2956799f627
Reviewed-on: https://cl.fcuny.net/c/world/+/682
Tested-by: CI
Reviewed-by: Franck Cuny <franck@fcuny.net>
Diffstat (limited to 'nix')
-rw-r--r--nix/mkSystem.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/nix/mkSystem.nix b/nix/mkSystem.nix
index d019e28..a411a98 100644
--- a/nix/mkSystem.nix
+++ b/nix/mkSystem.nix
@@ -15,11 +15,7 @@ inputs.nixpkgs.lib.nixosSystem {
           inputs.emacs-overlay.overlay
           inputs.nur.overlay
           (final: prev: {
-            tools = {
-              gerrit-hook = import ../tools/gerrit-hook final;
-              ipconverter = import ../tools/ipconverter final;
-              git-blame-stats = import ../tools/git-blame-stats final;
-            };
+            tools = import "${self}/tools" { pkgs = prev; };
           })
         ];
       };