forked from fediversity/fediversity
rm optional from deployer
Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
This commit is contained in:
parent
1496b51be5
commit
d9b380d279
1 changed files with 12 additions and 14 deletions
|
|
@ -74,10 +74,10 @@ in
|
||||||
## configuration and the store paths needed to build it and
|
## configuration and the store paths needed to build it and
|
||||||
## dump them in `system.extraDependencies`.
|
## dump them in `system.extraDependencies`.
|
||||||
machine =
|
machine =
|
||||||
(pkgs.nixos (
|
(pkgs.nixos [
|
||||||
[
|
|
||||||
./targetNode.nix
|
./targetNode.nix
|
||||||
# ../../../infra/common/nixos/repart.nix
|
# ../../../infra/common/nixos/repart.nix
|
||||||
|
"${modulesPath}/../lib/testing/nixos-test-base.nix"
|
||||||
config.system.extraDependenciesFromModule
|
config.system.extraDependenciesFromModule
|
||||||
{
|
{
|
||||||
nixpkgs.hostPlatform = "x86_64-linux";
|
nixpkgs.hostPlatform = "x86_64-linux";
|
||||||
|
|
@ -85,9 +85,7 @@ in
|
||||||
enableAcme = config.enableAcme;
|
enableAcme = config.enableAcme;
|
||||||
acmeNodeIP = config.acmeNodeIP;
|
acmeNodeIP = config.acmeNodeIP;
|
||||||
}
|
}
|
||||||
]
|
]).config;
|
||||||
++ (lib.optional config.useFlake "${modulesPath}/../lib/testing/nixos-test-base.nix")
|
|
||||||
)).config;
|
|
||||||
|
|
||||||
in
|
in
|
||||||
[
|
[
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue