Onboard remaing Community Edition plugins

tenzir · Feb 9, 2023 · e11a703 · e11a703
1 parent 2455c24
commit e11a703
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/flake.nix b/flake.nix
@@ -62,8  62,8 @@
         packages = flake-utils.lib.flattenTree {
           vast = pkgs.vast;
           vast-static = pkgs.pkgsStatic.vast;
-          vast-ce = pkgs.vast.withPlugins (ps: [ps.compaction]);
-          vast-ce-static = pkgs.pkgsStatic.vast.withPlugins (ps: [ps.compaction]);
           vast-ce = pkgs.vast-ce;
           vast-ce-static = pkgs.pkgsStatic.vast-ce;
           vast-integration-test-shell = pkgs.mkShell {
             packages = pkgs.vast-integration-test-deps;
           };

diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -206,6  206,10 @@ in {
       # https://github.com/NixOS/nixpkgs/issues/130963
       NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lc  abi";
     });
   vast-ce = final.vast.withPlugins (ps: [
     ps.matcher
     ps.netflow
   ]);
   vast-integration-test-deps = let
     py3 = prev.python3.withPackages (ps:
       with ps; [

diff --git a/nix/vast/plugins/default.nix b/nix/vast/plugins/default.nix
@@ -2,5  2,19 @@
   source = builtins.fromJSON (builtins.readFile ./source.json);
   vast-plugins = builtins.fetchGit source;
 in {
-  compaction = callPackage ./compaction.nix {inherit vast-plugins;};
   compaction = callPackage ./generic.nix {
     pname = "compaction";
     version = "1.4.0";
     src = "${vast-plugins}/compaction";
   };
   matcher = callPackage ./generic.nix {
     pname = "matcher";
     version = "3.0.0";
     src = "${vast-plugins}/matcher";
   };
   netflow = callPackage ./generic.nix {
     pname = "netflow";
     version = "1.0.0";
     src = "${vast-plugins}/netflow";
   };
 }
diff --git a/nix/vast/plugins/compaction.nix → nix/vast/plugins/generic.nix b/nix/vast/plugins/compaction.nix → nix/vast/plugins/generic.nix
@@ -1,15  1,14 @@
 {
   lib,
   stdenv,
-  vast-plugins,
   pname,
   version,
   src,
   cmake,
   vast,
 }:
 stdenv.mkDerivation {
-  pname = "vast-plugin-compaction";
-  version = "1.4.0";
-
-  src = "${vast-plugins}/compaction";
   inherit pname version src;
 
   nativeBuildInputs = [cmake];
   buildInputs = [vast];