Merge branch 'main' into add-package-option

This commit is contained in:
Alexander Nortung 2023-01-16 21:20:06 +01:00
commit b381c38113
74 changed files with 2083 additions and 713 deletions

View file

@ -8,6 +8,8 @@
, package ? pkgs.${name}
, extraPackages ? { }
, cmd ? null
, settings ? null
, extraOptions ? { }
, ...
}:
# returns a module
@ -49,6 +51,7 @@
name = serverName;
extraOptions = {
inherit cmd;
settings = if settings != null then settings cfg else { };
};
}];
};