yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix wrong default for imports

Browse Source
This commit is contained in:
Johannes Kirschbauer
2024-08-01 14:09:31 +02:00
parent d51508656f
commit ef58bea020
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/build-clan/module.nix
View File

@@ -70,7 +70,7 @@ let
++ [ ++ [
{ {
# Autoinclude configuration.nix and hardware-configuration.nix # Autoinclude configuration.nix and hardware-configuration.nix
imports = builtins.filter (p: builtins.pathExists p) [ imports = builtins.filter builtins.pathExists [
"${directory}/machines/${name}/configuration.nix" "${directory}/machines/${name}/configuration.nix"
"${directory}/machines/${name}/hardware-configuration.nix" "${directory}/machines/${name}/hardware-configuration.nix"
]; ];
@@ -81,7 +81,7 @@ let
(machines.${name} or { }) (machines.${name} or { })
# Inherit the inventory assertions ? # Inherit the inventory assertions ?
# { inherit (mergedInventory) assertions; } # { inherit (mergedInventory) assertions; }
{ imports = serviceConfigs.${name} or { }; } { imports = (serviceConfigs.${name} or [ ]); }
( (
{ {
# Settings # Settings
@@ -104,6 +104,7 @@ let
// lib.optionalAttrs (pkgs != null) { nixpkgs.pkgs = lib.mkForce pkgs; } // lib.optionalAttrs (pkgs != null) { nixpkgs.pkgs = lib.mkForce pkgs; }
) )
]; ];
specialArgs = { specialArgs = {
inherit clan-core; inherit clan-core;
} // specialArgs; } // specialArgs;