From: Scott Worley <scottworley@scottworley.com>
Date: Fri, 21 Jul 2023 04:01:25 +0000 (-0700)
Subject: Drop support for < 23.05
X-Git-Url: http://git.scottworley.com/nixos-qemu-vm-isolation/commitdiff_plain/26efd1b62cf514c1b90d0be0b9aab4345e8b0c21?ds=sidebyside

Drop support for < 23.05
---

diff --git a/modules/qemu-vm-isolation.nix b/modules/qemu-vm-isolation.nix
index 00dbac1..ad586ec 100644
--- a/modules/qemu-vm-isolation.nix
+++ b/modules/qemu-vm-isolation.nix
@@ -12,45 +12,38 @@ let
   else
     "/nix/store";
 
-in mkMerge [
-  {
-
-    boot.initrd.availableKernelModules = [ "squashfs" ];
-
-    fileSystems = mkVMOverride {
-      "${storeMountPath}" = {
-        device =
-          lookupDriveDeviceName "nixstore" config.virtualisation.qemu.drives;
-        fsType = "squashfs";
-        options = [ "ro" ];
-        neededForBoot = true;
-      };
+in {
+
+  boot.initrd.availableKernelModules = [ "squashfs" ];
+
+  fileSystems = mkVMOverride {
+    "${storeMountPath}" = {
+      device =
+        lookupDriveDeviceName "nixstore" config.virtualisation.qemu.drives;
+      fsType = "squashfs";
+      options = [ "ro" ];
+      neededForBoot = true;
     };
+  };
 
-    system.build.squashfsStore =
-      pkgs.callPackage (modulesPath + "/../lib/make-squashfs.nix") {
-        storeContents = config.virtualisation.additionalPaths;
-      };
+  system.build.squashfsStore =
+    pkgs.callPackage (modulesPath + "/../lib/make-squashfs.nix") {
+      storeContents = config.virtualisation.additionalPaths;
+    };
 
-    virtualisation = {
+  virtualisation = {
 
-      sharedDirectories = mkForce { };
+    sharedDirectories = mkForce { };
 
-      qemu.drives = [{
-        name = "nixstore";
-        file = "${config.system.build.squashfsStore}";
-        driveExtraOpts = {
-          format = "raw";
-          read-only = "on";
-          werror = "report";
-        };
-      }];
+    qemu.drives = [{
+      name = "nixstore";
+      file = "${config.system.build.squashfsStore}";
+      driveExtraOpts = {
+        format = "raw";
+        read-only = "on";
+        werror = "report";
+      };
+    }];
 
-    };
-  }
-  (mkIf (lib.version < "23.05") {
-    # This should always have been the default.
-    virtualisation.bootDevice =
-      lookupDriveDeviceName "root" config.virtualisation.qemu.drives;
-  })
-]
+  };
+}