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

WIP: test data model thru VM #11

Closed
kiara wants to merge 70 commits from data-model-test-deployment-plain into deployment-data-model-with-tests
pull from: data-model-test-deployment-plain
merge into: fricklerhandwerk:deployment-data-model-with-tests
Conversation 2 Commits 70 Files changed 22 +13 -19
2 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6257ad5bd1 - Show all commits

17
deployment/check/data-model/nixosTest.nix
View file

@ -90,23 +90,8 @@ in
autoconf
];
};
eval = import "${sources.nixpkgs}/nixos/lib/eval-config.nix" {
system = builtins.currentSystem;
specialArgs = {
inherit sources;
};
modules = [ configuration ];
};
os = {
inherit (eval) pkgs config options;
system = eval.config.system.build.toplevel;
inherit (eval.config.system.build) vm vmWithBootLoader;
};
in
{
drv_path = os.config.system.build.toplevel.drvPath;
out_path = os.config.system.build.toplevel;
}
import ${pathToRoot}/deployment/nixos.nix { inherit configuration; }
'
)
# instantiate the config in /nix/store

15
deployment/nixos.nix
View file

@ -4,11 +4,20 @@
}:
let
sources = import ../npins;
os = import "${sources.nixpkgs}/nixos" { inherit system configuration; };
eval = import "${sources.nixpkgs}/nixos/lib/eval-config.nix" {
inherit system;
specialArgs = {
inherit sources;
};
modules = [ configuration ];
};
os = {
inherit (eval) pkgs config options;
system = eval.config.system.build.toplevel;
inherit (eval.config.system.build) vm vmWithBootLoader;
};
in
{
substituters = builtins.concatStringsSep " " os.config.nix.settings.substituters;
trusted_public_keys = builtins.concatStringsSep " " os.config.nix.settings.trusted-public-keys;
drv_path = os.config.system.build.toplevel.drvPath;
out_path = os.config.system.build.toplevel;
}