drop non-existent clan modules
All checks were successful
checks-impure / test (pull_request) Successful in 3s
checks / test (pull_request) Successful in 3s

This commit is contained in:
Jörg Thalheim 2023-08-29 22:29:32 +02:00
parent 7c21453b17
commit 72768573db
3 changed files with 4 additions and 6 deletions

View File

@ -1,4 +1,4 @@
{ nixpkgs, clan, lib }:
{ nixpkgs, lib }:
{ directory # The directory containing the machines subdirectory
, 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} = { ... }
@ -20,7 +20,7 @@ let
modules = [
(machineSettings name)
(machines.${name} or { })
] ++ lib.attrValues clan.clanModules;
];
specialArgs = specialArgs;
})
(machinesDirs // machines);

View File

@ -1,4 +1,4 @@
{ lib, clan, nixpkgs, ... }:
{ lib, nixpkgs, ... }:
{
findNixFiles = folder:
lib.mapAttrs'
@ -14,5 +14,5 @@
jsonschema = import ./jsonschema { inherit lib; };
buildClan = import ./build-clan { inherit lib clan nixpkgs; };
buildClan = import ./build-clan { inherit lib nixpkgs; };
}

View File

@ -1,5 +1,4 @@
{ lib
, self
, inputs
, ...
}: {
@ -7,7 +6,6 @@
./jsonschema/flake-module.nix
];
flake.lib = import ./default.nix {
clan = self;
inherit lib;
inherit (inputs) nixpkgs;
};