drop non-existent clan modules
This commit is contained in:
parent
7c21453b17
commit
72768573db
@ -1,4 +1,4 @@
|
|||||||
{ nixpkgs, clan, lib }:
|
{ nixpkgs, lib }:
|
||||||
{ directory # The directory containing the machines subdirectory
|
{ directory # The directory containing the machines subdirectory
|
||||||
, specialArgs ? { } # Extra arguments to pass to nixosSystem i.e. useful to make self available
|
, specialArgs ? { } # Extra arguments to pass to nixosSystem i.e. useful to make self available
|
||||||
, machines ? { } # allows to include machine-specific modules i.e. machines.${name} = { ... }
|
, machines ? { } # allows to include machine-specific modules i.e. machines.${name} = { ... }
|
||||||
@ -20,7 +20,7 @@ let
|
|||||||
modules = [
|
modules = [
|
||||||
(machineSettings name)
|
(machineSettings name)
|
||||||
(machines.${name} or { })
|
(machines.${name} or { })
|
||||||
] ++ lib.attrValues clan.clanModules;
|
];
|
||||||
specialArgs = specialArgs;
|
specialArgs = specialArgs;
|
||||||
})
|
})
|
||||||
(machinesDirs // machines);
|
(machinesDirs // machines);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, clan, nixpkgs, ... }:
|
{ lib, nixpkgs, ... }:
|
||||||
{
|
{
|
||||||
findNixFiles = folder:
|
findNixFiles = folder:
|
||||||
lib.mapAttrs'
|
lib.mapAttrs'
|
||||||
@ -14,5 +14,5 @@
|
|||||||
|
|
||||||
jsonschema = import ./jsonschema { inherit lib; };
|
jsonschema = import ./jsonschema { inherit lib; };
|
||||||
|
|
||||||
buildClan = import ./build-clan { inherit lib clan nixpkgs; };
|
buildClan = import ./build-clan { inherit lib nixpkgs; };
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, self
|
|
||||||
, inputs
|
, inputs
|
||||||
, ...
|
, ...
|
||||||
}: {
|
}: {
|
||||||
@ -7,7 +6,6 @@
|
|||||||
./jsonschema/flake-module.nix
|
./jsonschema/flake-module.nix
|
||||||
];
|
];
|
||||||
flake.lib = import ./default.nix {
|
flake.lib = import ./default.nix {
|
||||||
clan = self;
|
|
||||||
inherit lib;
|
inherit lib;
|
||||||
inherit (inputs) nixpkgs;
|
inherit (inputs) nixpkgs;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user