move arguments from _module.args
to specialArgs
(#469)
All checks were successful
deploy-infra / deploy (push) Successful in 2m17s
/ check-pre-commit (push) Successful in 17s
/ check-data-model (push) Successful in 29s
/ check-mastodon (push) Successful in 22s
/ check-peertube (push) Successful in 21s
/ check-panel (push) Successful in 1m32s
/ check-deployment-basic (push) Successful in 32s
/ check-deployment-cli (push) Successful in 43s
/ check-deployment-panel (push) Successful in 1m50s
/ check-pre-commit (pull_request) Successful in 13s
/ check-data-model (pull_request) Successful in 31s
/ check-mastodon (pull_request) Successful in 5s
/ check-peertube (pull_request) Successful in 4s
/ check-panel (pull_request) Successful in 1m36s
/ check-deployment-basic (pull_request) Successful in 4s
/ check-deployment-cli (pull_request) Successful in 4s
/ check-deployment-panel (pull_request) Successful in 4s
All checks were successful
deploy-infra / deploy (push) Successful in 2m17s
/ check-pre-commit (push) Successful in 17s
/ check-data-model (push) Successful in 29s
/ check-mastodon (push) Successful in 22s
/ check-peertube (push) Successful in 21s
/ check-panel (push) Successful in 1m32s
/ check-deployment-basic (push) Successful in 32s
/ check-deployment-cli (push) Successful in 43s
/ check-deployment-panel (push) Successful in 1m50s
/ check-pre-commit (pull_request) Successful in 13s
/ check-data-model (pull_request) Successful in 31s
/ check-mastodon (pull_request) Successful in 5s
/ check-peertube (pull_request) Successful in 4s
/ check-panel (pull_request) Successful in 1m36s
/ check-deployment-basic (pull_request) Successful in 4s
/ check-deployment-cli (pull_request) Successful in 4s
/ check-deployment-panel (pull_request) Successful in 4s
Reviewed-on: #469 Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io> Co-authored-by: Kiara Grouwstra <kiara@procolix.eu> Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
This commit is contained in:
parent
e488230d7b
commit
4509d277d3
1 changed files with 13 additions and 11 deletions
|
@ -23,21 +23,17 @@ let
|
||||||
makeResourceModule =
|
makeResourceModule =
|
||||||
{ vmName, isTestVm }:
|
{ vmName, isTestVm }:
|
||||||
{
|
{
|
||||||
# TODO(@fricklerhandwerk): this is terrible but IMO we should just ditch flake-parts and have our own data model for how the project is organised internally
|
|
||||||
_module.args = {
|
|
||||||
inherit
|
|
||||||
inputs
|
|
||||||
keys
|
|
||||||
secrets
|
|
||||||
;
|
|
||||||
};
|
|
||||||
|
|
||||||
nixos.module.imports = [
|
nixos.module.imports = [
|
||||||
./common/proxmox-qemu-vm.nix
|
./common/proxmox-qemu-vm.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
nixos.specialArgs = {
|
nixos.specialArgs = {
|
||||||
inherit sources;
|
inherit
|
||||||
|
sources
|
||||||
|
inputs
|
||||||
|
keys
|
||||||
|
secrets
|
||||||
|
;
|
||||||
};
|
};
|
||||||
|
|
||||||
imports =
|
imports =
|
||||||
|
@ -79,7 +75,13 @@ let
|
||||||
# TODO(@fricklerhandwerk): we may want to pass through all of `specialArgs`
|
# TODO(@fricklerhandwerk): we may want to pass through all of `specialArgs`
|
||||||
# once we're sure it's sane. leaving it here for better control during refactoring.
|
# once we're sure it's sane. leaving it here for better control during refactoring.
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit sources;
|
inherit
|
||||||
|
sources
|
||||||
|
inputs
|
||||||
|
keys
|
||||||
|
secrets
|
||||||
|
|
||||||
|
;
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Reference in a new issue