flake.nix

@@ -97,15 +97,10 @@
       # Garbage collection root #
       ###########################
 
-      packages.${system} =
+      packages.${system} = {
-        let
+        default = vm.config.system.build.vm;
-          localPkgs = import ./pkgs { inherit pkgs; };
+      }
-        in
+      // import ./pkgs { inherit pkgs; };
-        {
-          default = vm.config.system.build.vm;
-          crowdsec-hub = localPkgs.crowdsec.hub;
-          crowdsec-firewall-bouncer = localPkgs.crowdsec.firewall-bouncer;
-        };
 
       ###################
       # Utility scripts #

pkgs/crowdsec/default.nix

@@ -1,9 +0,0 @@
-{ pkgs }:
-let
-  sources = pkgs.callPackage ./_sources/generated.nix { };
-  callPackage = pkgs.lib.callPackageWith (pkgs // { inherit sources; });
-in
-{
-  hub = callPackage ./hub.nix { };
-  firewall-bouncer = callPackage ./firewall-bouncer.nix { };
-}

pkgs/default.nix

@@ -1,4 +1,7 @@
 { pkgs }:
-{
+pkgs.lib.packagesFromDirectoryRecursive {
-  crowdsec = import ./crowdsec { inherit pkgs; };
+  callPackage = pkgs.lib.callPackageWith (
+    pkgs // { sources = pkgs.callPackage ./_sources/generated.nix { }; }
+  );
+  directory = ./packages;
 }