nixos/osquery: add package option (NixOS#485164)

Author: nlewo

nixos/modules/services/monitoring/osquery.nix

@@ -25,17 +25,20 @@ let
         ({ config_path = conf; } // cfg.flags)
     )
   );
-
+  osquery = cfg.package;
   osqueryi = pkgs.runCommand "osqueryi" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
     mkdir -p $out/bin
-    makeWrapper ${pkgs.osquery}/bin/osqueryi $out/bin/osqueryi \
+    makeWrapper ${osquery}/bin/osqueryi $out/bin/osqueryi \
       --add-flags "--flagfile ${flagfile} --disable-database"
   '';
+
 in
 {
   options.services.osquery = {
     enable = lib.mkEnableOption "osqueryd daemon";
 
+    package = lib.mkPackageOption pkgs "osquery" { };
+
     settings = lib.mkOption {
       default = { };
       description = ''
@@ -108,15 +111,15 @@ in
       ];
       description = "The osquery daemon";
       serviceConfig = {
-        ExecStart = "${pkgs.osquery}/bin/osqueryd --flagfile ${flagfile}";
+        ExecStart = "${osquery}/bin/osqueryd --flagfile ${flagfile}";
         PIDFile = cfg.flags.pidfile;
         LogsDirectory = lib.mkIf (cfg.flags.logger_path == "/var/log/osquery") [ "osquery" ];
         StateDirectory = lib.mkIf (cfg.flags.database_path == "/var/lib/osquery/osquery.db") [ "osquery" ];
         Restart = "always";
       };
       wantedBy = [ "multi-user.target" ];
     };
-    systemd.tmpfiles.settings."10-osquery".${dirname (cfg.flags.pidfile)}.d = {
+    systemd.tmpfiles.settings."10-osquery".${dirname cfg.flags.pidfile}.d = {
       user = "root";
       group = "root";
       mode = "0755";

nixos/tests/osquery.nix

@@ -1,5 +1,5 @@
 import ./make-test-python.nix (
-  { lib, pkgs, ... }:
+  { lib, ... }:
 
   let
     config_refresh = "10";
@@ -13,19 +13,17 @@ import ./make-test-python.nix (
       lewo
     ];
 
-    nodes.machine =
-      { config, pkgs, ... }:
-      {
-        services.osquery = {
-          enable = true;
-
-          settings.options = { inherit nullvalue utc; };
-          flags = {
-            inherit config_refresh;
-            nullvalue = "IGNORED";
-          };
+    nodes.machine = _: {
+      services.osquery = {
+        enable = true;
+
+        settings.options = { inherit nullvalue utc; };
+        flags = {
+          inherit config_refresh;
+          nullvalue = "IGNORED";
         };
       };
+    };
 
     testScript =
       { nodes, ... }: