move ensureZfsMounts

This commit is contained in:
2025-08-11 16:18:10 -07:00
parent 80df89e9a1
commit 30421d96f0
5 changed files with 68 additions and 50 deletions

View File

@@ -10,7 +10,10 @@ let
testPkgs = import inputs.nixpkgs {
system = pkgs.system;
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "minecraft-server" ];
overlays = [ inputs.nix-minecraft.overlay ];
overlays = [
inputs.nix-minecraft.overlay
(import ../overlays.nix)
];
};
# Create a wrapper module that imports the actual minecraft service

View File

@@ -2,9 +2,17 @@
config,
lib,
pkgs,
inputs,
...
}:
pkgs.testers.runNixOSTest {
let
# Create pkgs with ensureZfsMounts overlay
testPkgs = import inputs.nixpkgs {
system = pkgs.system;
overlays = [ (import ../overlays.nix) ];
};
in
testPkgs.testers.runNixOSTest {
name = "zfs folder dependency and mounting test";
nodes.machine =
@@ -35,7 +43,7 @@ pkgs.testers.runNixOSTest {
environment.systemPackages = [
pkgs.parted
lib.ensureZfsMounts
pkgs.ensureZfsMounts
];
systemd.services.foobar = {