From e9b34e0de8e9e43420177cfca01a96a79693d0a9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 23 Oct 2022 12:43:07 +1000 Subject: [PATCH 1/2] hound: add passthru.tests --- pkgs/development/tools/misc/hound/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index ff9253e4b039..4c186ca35404 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -4,6 +4,7 @@ , makeWrapper , mercurial , git +, nixosTests }: buildGoModule rec { @@ -28,6 +29,8 @@ buildGoModule rec { wrapProgram $out/bin/houndd --prefix PATH : ${lib.makeBinPath [ mercurial git ]} ''; + passthru.tests = { inherit (nixosTests) hound; }; + meta = with lib; { inherit (src.meta) homepage; description = "Lightning fast code searching made easy"; From 217bf31c03733605815a484e94c7c7e550863ed0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 23 Oct 2022 12:47:44 +1000 Subject: [PATCH 2/2] hound, nixos/hound: deduplicate runtime deps --- nixos/modules/services/search/hound.nix | 1 - pkgs/development/tools/misc/hound/default.nix | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix index c81ceee54696..b41a2e2bae1f 100644 --- a/nixos/modules/services/search/hound.nix +++ b/nixos/modules/services/search/hound.nix @@ -120,7 +120,6 @@ in { " -conf ${pkgs.writeText "hound.json" cfg.config}"; }; - path = [ pkgs.git pkgs.mercurial pkgs.openssh ]; }; }; diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 4c186ca35404..5d0120804f44 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -4,6 +4,7 @@ , makeWrapper , mercurial , git +, openssh , nixosTests }: @@ -26,7 +27,7 @@ buildGoModule rec { doCheck = false; postInstall = '' - wrapProgram $out/bin/houndd --prefix PATH : ${lib.makeBinPath [ mercurial git ]} + wrapProgram $out/bin/houndd --prefix PATH : ${lib.makeBinPath [ mercurial git openssh ]} ''; passthru.tests = { inherit (nixosTests) hound; };