about summary refs log tree commit diff
path: root/nixos/tests/boot.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-05-03 22:05:11 +0200
committeraszlig <aszlig@redmoonstudios.org>2016-05-03 22:05:11 +0200
commite7d3166656af0d98da9f59c78e2213cec842d743 (patch)
treec8d9d2e524e4c7168aff3ecbbe26545ab4b8cd94 /nixos/tests/boot.nix
parent82475a9a7c7b72fd85dd8408b9ada5b498d55dfe (diff)
nixos/tests/netboot: Fix evaluation error
Regression introduced by dfe608c8a2ecfdf0ab2838a967440207250a0b95.

The commit turns the two arguments into one attrset argument so we need
to adapt that to use the new calling convention.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos/tests/boot.nix')
-rw-r--r--nixos/tests/boot.nix15
1 files changed, 9 insertions, 6 deletions
diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix
index a138ba4bcf087..af7db5aa8164d 100644
--- a/nixos/tests/boot.nix
+++ b/nixos/tests/boot.nix
@@ -64,11 +64,14 @@ in {
         '';
         destination = "/boot.ipxe";
       };
-      ipxeBootDir = pkgs.symlinkJoin "ipxeBootDir" [
-        config.system.build.netbootRamdisk
-        config.system.build.kernel
-        ipxeScriptDir
-      ];
+      ipxeBootDir = pkgs.symlinkJoin {
+        name = "ipxeBootDir";
+        paths = [
+          config.system.build.netbootRamdisk
+          config.system.build.kernel
+          ipxeScriptDir
+        ];
+      };
     in
       makeTest {
         name = "boot-netboot";
@@ -81,4 +84,4 @@ in {
             $machine->shutdown;
           '';
       };
-}
\ No newline at end of file
+}