From 1db8ba6f4b4b6120702845027604d5da598a991e Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sat, 6 Aug 2022 12:50:56 -0700 Subject: 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 --- nix/mkSystem.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'nix') 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; }; }) ]; }; -- cgit 1.4.1