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