Compare commits

...
Author SHA1 Message Date
Richie bbb2403093 fixed typo
treefmt / nix fmt (pull_request) Failing after 4s
build_systems / build-portal-1 (pull_request) Successful in 32s
pytest / pytest (pull_request) Successful in 34s
test ebook search / test-ebook-search (pull_request) Successful in 40s
build_systems / build-brain (pull_request) Successful in 1m0s
build_systems / build-bob (pull_request) Successful in 1m4s
build_systems / build-jeeves (pull_request) Successful in 1m17s
build_systems / build-rhapsody-in-green (pull_request) Successful in 1m18s
2026-09-11 11:43:08 -04:00
Richie 500ac863d8 temp v3 suport 2026-09-11 11:42:57 -04:00
Richie 4c1ec18794 adding root_pool/nix_build to all zfs boxes
this fixes issues with file how the test intract with zfs file systems
2026-09-11 11:41:54 -04:00
Richie 1c427023ed adding root_pool/nix_build to all zfs boxes
this fixes issues with file how the test intract with zfs file systems
2026-09-11 10:47:52 -04:00
7 changed files with 33 additions and 8 deletions
+4
View File
@@ -31,6 +31,10 @@ in
"flakes"
"ca-derivations"
];
system-features = lib.mkAfter [
"gccarch-x86-64-v2"
"gccarch-x86-64-v3"
];
warn-dirty = false;
flake-registry = ""; # disable global flake registries
connect-timeout = 10;
+6 -4
View File
@@ -188,7 +188,7 @@ def create_zfs_datasets() -> None:
"normalization=none",
"-o",
"utf8only=off",
"root_pool/nix_build",
"root_pool/nix/var/nix/builds",
)
)
datasets = run_output(("zfs", "list", "-o", "name"))
@@ -198,7 +198,7 @@ def create_zfs_datasets() -> None:
"root_pool/home",
"root_pool/var",
"root_pool/nix",
"root_pool/nix_build",
"root_pool/nix/var/nix/builds",
}
missing_datasets = expected_datasets.difference(datasets.splitlines())
if missing_datasets:
@@ -264,7 +264,7 @@ def create_nix_hardware_file(mnt_dir: str, disks: Sequence[str], encrypt: str |
' "/home" = {\n device = "root_pool/home";\n fsType = "zfs";\n };\n\n'
' "/var" = {\n device = "root_pool/var";\n fsType = "zfs";\n };\n\n'
' "/nix" = {\n device = "root_pool/nix";\n fsType = "zfs";\n };\n\n'
' "/nix_build" = {\n device = "root_pool/nix_build";\n fsType = "zfs";\n };\n\n'
' "/nix/var/nix/builds" = {\n device = "root_pool/nix/var/nix/builds";\n fsType = "zfs";\n };\n\n'
' "/boot" = {\n'
f' device = "/dev/disk/by-uuid/{get_boot_drive_id(disks[0])}";\n'
' fsType = "vfat";\n options = [\n "fmask=0077"\n'
@@ -287,7 +287,9 @@ def install_nixos(mnt_dir: str, disks: Sequence[str], encrypt: str | None) -> No
run_output(("mount", "-o", "X-mount.mkdir", "-t", "zfs", "root_pool/home", f"{mnt_dir}/home"))
run_output(("mount", "-o", "X-mount.mkdir", "-t", "zfs", "root_pool/var", f"{mnt_dir}/var"))
run_output(("mount", "-o", "X-mount.mkdir", "-t", "zfs", "root_pool/nix", f"{mnt_dir}/nix"))
run_output(("mount", "-o", "X-mount.mkdir", "-t", "zfs", "root_pool/nix_build", f"{mnt_dir}/nix_build"))
run_output(
("mount", "-o", "X-mount.mkdir", "-t", "zfs", "root_pool/nix/var/nix/builds", f"{mnt_dir}/nix/var/nix/builds")
)
for disk in disks:
run_output(("mkfs.vfat", "-n", "EFI", f"{disk}-part1"))
+5
View File
@@ -50,6 +50,11 @@
fsType = "zfs";
};
"/nix/var/nix/builds" = {
device = "root_pool/nix/var/nix/builds";
fsType = "zfs";
};
"/var" = {
device = "root_pool/var";
fsType = "zfs";
+5
View File
@@ -53,6 +53,11 @@
fsType = "zfs";
};
"/nix/var/nix/builds" = {
device = "root_pool/nix/var/nix/builds";
fsType = "zfs";
};
"/boot" = {
device = "/dev/disk/by-uuid/12CE-A600";
fsType = "vfat";
-4
View File
@@ -24,10 +24,6 @@ in
./runners
./syncthing.nix
];
nix.settings.system-features = lib.mkAfter [
"gccarch-x86-64-v2"
"gccarch-x86-64-v3"
];
services = {
openssh.ports = [ 629 ];
+5
View File
@@ -96,6 +96,11 @@ in
fsType = "zfs";
};
"/nix/var/nix/builds" = {
device = "root_pool/nix/var/nix/builds";
fsType = "zfs";
};
"/var" = {
device = "root_pool/var";
fsType = "zfs";
+8
View File
@@ -34,14 +34,22 @@
device = "root_pool/root";
fsType = "zfs";
};
"/home" = {
device = "root_pool/home";
fsType = "zfs";
};
"/nix/var/nix/builds" = {
device = "root_pool/nix/var/nix/builds";
fsType = "zfs";
};
"/var" = {
device = "root_pool/var";
fsType = "zfs";
};
"/boot" = {
device = "/dev/disk/by-uuid/12CE-A600";
fsType = "vfat";