refactor(pkgs): Use packagesFromDirectoryRecursive
This commit is contained in:
parent
cd012e86ba
commit
e2012ebc9a
8 changed files with 9 additions and 20 deletions
11
flake.nix
11
flake.nix
|
@ -97,15 +97,10 @@
|
|||
# Garbage collection root #
|
||||
###########################
|
||||
|
||||
packages.${system} =
|
||||
let
|
||||
localPkgs = import ./pkgs { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
packages.${system} = {
|
||||
default = vm.config.system.build.vm;
|
||||
crowdsec-hub = localPkgs.crowdsec.hub;
|
||||
crowdsec-firewall-bouncer = localPkgs.crowdsec.firewall-bouncer;
|
||||
};
|
||||
}
|
||||
// import ./pkgs { inherit pkgs; };
|
||||
|
||||
###################
|
||||
# Utility scripts #
|
||||
|
|
|
@ -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 { };
|
||||
}
|
|
@ -1,4 +1,7 @@
|
|||
{ pkgs }:
|
||||
{
|
||||
crowdsec = import ./crowdsec { inherit pkgs; };
|
||||
pkgs.lib.packagesFromDirectoryRecursive {
|
||||
callPackage = pkgs.lib.callPackageWith (
|
||||
pkgs // { sources = pkgs.callPackage ./_sources/generated.nix { }; }
|
||||
);
|
||||
directory = ./packages;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue