From ecfa7fbf9ae30f19f1da1b7b1d266962235945b5 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@failmail.dev>
Date: Tue, 3 Dec 2024 21:47:10 +0100
Subject: [PATCH 1/2] fix: dulicate definition of tapMultiQueue

---
 lib/runner.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/runner.nix b/lib/runner.nix
index 9b114d1f..24a928f7 100644
--- a/lib/runner.nix
+++ b/lib/runner.nix
@@ -63,7 +63,6 @@ pkgs.buildPackages.runCommand "microvm-${microvmConfig.hypervisor}-${hostName}"
   passthru = {
     inherit canShutdown supportsNotifySocket tapMultiQueue;
     inherit (microvmConfig) hypervisor;
-    inherit (hypervisorConfig) tapMultiQueue;
   };
 } ''
   mkdir -p $out/bin

From 68c4ab8d096b3b283e1f4e4695230885eab8efa1 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@failmail.dev>
Date: Tue, 3 Dec 2024 21:57:04 +0100
Subject: [PATCH 2/2] fix: macvtap-down as lines

---
 nixos-modules/microvm/interfaces.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos-modules/microvm/interfaces.nix b/nixos-modules/microvm/interfaces.nix
index 2d6383f8..bf5c62f3 100644
--- a/nixos-modules/microvm/interfaces.nix
+++ b/nixos-modules/microvm/interfaces.nix
@@ -53,11 +53,11 @@ in
         ${pkgs.coreutils-full}/bin/chown '${user}:${group}' /dev/tap$(< "/sys/class/net/${id}/ifindex")
       '') macvtapInterfaces;
 
-      macvap-down = pkgs.writeShellScriptBin "microvm-${hostName}-macvtap-down" (''
+      macvtap-down = ''
         set -ou pipefail
-      '' + lib.concatMapStrings ({ id, mac, ... }: ''
+      '' + lib.concatMapStrings ({ id, ... }: ''
         ${pkgs.iproute2}/bin/ip link del name '${id}'
-      '') macvtapInterfaces);
+      '') macvtapInterfaces;
     }
   ) ];
 }