tests: pass lib to examples

12 files changed, 59 insertions, 13 deletions

diff --git a/example/boot-raid1.nix b/example/boot-raid1.nix
index c930eb5..dfd2e6c 100644
--- a/example/boot-raid1.nix
+++ b/example/boot-raid1.nix
@@ -1,4 +1,4 @@
-{ disks ? [ "/dev/vdb" "/dev/vdc" ] }: {
+{ disks ? [ "/dev/vdb" "/dev/vdc" ], ... }: {
   disk = {
     one = {
       type = "disk";
diff --git a/example/btrfs-subvolumes.nix b/example/btrfs-subvolumes.nix
index 9a22861..02ce2a4 100644
--- a/example/btrfs-subvolumes.nix
+++ b/example/btrfs-subvolumes.nix
@@ -1,4 +1,4 @@
-{ disks ? [ "/dev/vdb" ] }: {
+{ disks ? [ "/dev/vdb" ], ... }: {
   disk = {
     vdb = {
       type = "disk";
diff --git a/example/complex.nix b/example/complex.nix
index 7ee9282..f2204a6 100644
--- a/example/complex.nix
+++ b/example/complex.nix
@@ -1,4 +1,4 @@
-{ disks ? [ "/dev/vdb" "/dev/vdc" ] }: {
+{ disks ? [ "/dev/vdb" "/dev/vdc" ], ... }: {
   disk = {
     disk0 = {
       type = "disk";
diff --git a/example/gpt-bios-compat.nix b/example/gpt-bios-compat.nix
index 72886a0..7275e26 100644
--- a/example/gpt-bios-compat.nix
+++ b/example/gpt-bios-compat.nix
@@ -1,5 +1,5 @@
 # Example to create a bios compatible gpt partition
-{ disks ? [ "/dev/vdb" ] }: {
+{ disks ? [ "/dev/vdb" ], ... }: {
   disk = {
     vdb = {
       device = builtins.elemAt disks 0;
diff --git a/example/luks-lvm.nix b/example/luks-lvm.nix
index fdaba8c..8ffb273 100644
--- a/example/luks-lvm.nix
+++ b/example/luks-lvm.nix
@@ -1,4 +1,4 @@
-{ disks ? [ "/dev/vdb" ] }: {
+{ disks ? [ "/dev/vdb" ], ... }: {
   disk = {
     vdb = {
       type = "disk";
diff --git a/example/lvm-raid.nix b/example/lvm-raid.nix
index 9d0c9d7..8622238 100644
--- a/example/lvm-raid.nix
+++ b/example/lvm-raid.nix
@@ -1,4 +1,4 @@
-{ disks ? [ "/dev/vdb" "/dev/vdc" ] }: {
+{ disks ? [ "/dev/vdb" "/dev/vdc" ], ... }: {
   disk = {
     one = {
       type = "disk";
diff --git a/example/mdadm.nix b/example/mdadm.nix
index 8093698..132ead5 100644
--- a/example/mdadm.nix
+++ b/example/mdadm.nix
@@ -1,4 +1,4 @@
-{ disks ? [ "/dev/vdb" "/dev/vdc" ] }: {
+{ disks ? [ "/dev/vdb" "/dev/vdc" ], ... }: {
   disk = {
     vdb = {
       type = "disk";
diff --git a/example/with-lib.nix b/example/with-lib.nix
new file mode 100644
index 0000000..e746f5b
--- /dev/null
+++ b/example/with-lib.nix
@@ -0,0 +1,35 @@
+# Example to create a bios compatible gpt partition
+{ disks ? [ "/dev/vdb" ], lib, ... }: {
+  disk = lib.traceValSeq (lib.genAttrs [ (lib.head disks) ] (device: {
+    device = device;
+    type = "disk";
+    content = {
+      type = "table";
+      format = "gpt";
+      partitions = [
+        {
+          name = "boot";
+          type = "partition";
+          start = "0";
+          end = "1M";
+          part-type = "primary";
+          flags = ["bios_grub"];
+        }
+        {
+          name = "root";
+          type = "partition";
+          # leave space for the grub aka BIOS boot
+          start = "1M";
+          end = "100%";
+          part-type = "primary";
+          bootable = true;
+          content = {
+            type = "filesystem";
+            format = "ext4";
+            mountpoint = "/";
+          };
+        }
+      ];
+    };
+  }));
+}
diff --git a/example/zfs-over-legacy.nix b/example/zfs-over-legacy.nix
index 9943278..974af35 100644
--- a/example/zfs-over-legacy.nix
+++ b/example/zfs-over-legacy.nix
@@ -1,4 +1,4 @@
-{ disks ? [ "/dev/vdb" "/dev/vdc" ] }: {
+{ disks ? [ "/dev/vdb" "/dev/vdc" ], ... }: {
   disk = {
     vdb = {
       type = "disk";
diff --git a/example/zfs.nix b/example/zfs.nix
index 92ed688..59c3f24 100644
--- a/example/zfs.nix
+++ b/example/zfs.nix
@@ -1,4 +1,4 @@
-{ disks ? [ "/dev/vdb" "/dev/vdc" ] }: {
+{ disks ? [ "/dev/vdb" "/dev/vdc" ], ... }: {
   disk = {
     x = {
       type = "disk";
diff --git a/tests/lib.nix b/tests/lib.nix
index fb9d1e9..b3b3009 100644
--- a/tests/lib.nix
+++ b/tests/lib.nix
@@ -21,10 +21,10 @@
           inherit (pkgs) system;
         };
       disks = [ "/dev/vda" "/dev/vdb" "/dev/vdc" "/dev/vdd" "/dev/vde" "/dev/vdf" ];
-      tsp-create = pkgs.writeScript "create" ((pkgs.callPackage ../. { }).create (disko-config { disks = builtins.tail disks; }));
-      tsp-mount = pkgs.writeScript "mount" ((pkgs.callPackage ../. { }).mount (disko-config { disks = builtins.tail disks; }));
-      tsp-config = (pkgs.callPackage ../. { }).config (disko-config { inherit disks; });
-      num-disks = builtins.length (lib.attrNames (disko-config {}).disk);
+      tsp-create = pkgs.writeScript "create" ((pkgs.callPackage ../. { }).create (disko-config { disks = builtins.tail disks; inherit lib; }));
+      tsp-mount = pkgs.writeScript "mount" ((pkgs.callPackage ../. { }).mount (disko-config { disks = builtins.tail disks; inherit lib; }));
+      tsp-config = (pkgs.callPackage ../. { }).config (disko-config { inherit disks; inherit lib; });
+      num-disks = builtins.length (lib.attrNames (disko-config { inherit lib; }).disk);
       installed-system = { modulesPath, ... }: {
         imports = [
           tsp-config
diff --git a/tests/with-lib.nix b/tests/with-lib.nix
new file mode 100644
index 0000000..e94cf00
--- /dev/null
+++ b/tests/with-lib.nix
@@ -0,0 +1,11 @@
+{ pkgs ? (import <nixpkgs> { })
+, makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
+}:
+makeDiskoTest {
+  disko-config = import ../example/with-lib.nix;
+  extraTestScript = ''
+    machine.succeed("mountpoint /");
+  '';
+  efi = false;
+  grub-devices = [ "/dev/vdb" ];
+}