kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

move imports from paste to targetNode to increase parity between paste and nixosTest

Browse source
This commit is contained in:
Kiara Grouwstra 2025-08-23 12:54:56 +02:00
parent 4d85dd96f2
commit 13139a4b4b
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
deployment/check/common/targetNode.nix
View file

@ -3,6 +3,7 @@
config, config,
lib, lib,
modulesPath, modulesPath,
sources,
... ...
}: }:
@ -17,7 +18,10 @@ in
imports = [ imports = [
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
(modulesPath + "/../lib/testing/nixos-test-base.nix") (modulesPath + "/../lib/testing/nixos-test-base.nix")
"${sources.disko}/module.nix"
../../../infra/common/proxmox-qemu-vm.nix
./sharedOptions.nix ./sharedOptions.nix
../../../infra/common/nixos/users.nix
]; ];
config = mkMerge [ config = mkMerge [

4
paste
View file

@ -9,11 +9,7 @@ command=(nix-instantiate --expr '
sources = import ./npins; sources = import ./npins;
configuration = { configuration = {
imports = [ imports = [
./infra/common/proxmox-qemu-vm.nix
./infra/common/nixos/users.nix
./deployment/check/common/sharedOptions.nix
./deployment/check/common/targetNode.nix ./deployment/check/common/targetNode.nix
"${sources.disko}/module.nix"
]; ];
}; };
eval = import "${sources.nixpkgs}/nixos/lib/eval-config.nix" { eval = import "${sources.nixpkgs}/nixos/lib/eval-config.nix" {