Merge pull request microvm-nix#390 from SuperSandro2000/deadnix

SuperSandro2000 · web-flow · commit 5e193f2c5cf9 · 2025-07-22T00:35:25.000+02:00
Fix deadnix
diff --git a/checks/shutdown-command.nix b/checks/shutdown-command.nix
@@ -1,4 +1,4 @@
-{ self, nixpkgs, system, makeTestConfigs }:
+{ nixpkgs, system, makeTestConfigs, ... }:
 
 let
   pkgs = nixpkgs.legacyPackages.${system};
diff --git a/checks/startup-shutdown.nix b/checks/startup-shutdown.nix
@@ -1,4 +1,4 @@
-{ self, nixpkgs, system, makeTestConfigs }:
+{ nixpkgs, system, makeTestConfigs, ... }:
 
 let
   pkgs = nixpkgs.legacyPackages.${system};
diff --git a/examples/graphics.nix b/examples/graphics.nix
@@ -10,7 +10,7 @@ nixpkgs.lib.nixosSystem {
     # this runs as a MicroVM
     self.nixosModules.microvm
 
-    ({ config, lib, pkgs, ... }: {
+    ({ lib, pkgs, ... }: {
       microvm = {
         hypervisor = "cloud-hypervisor";
         graphics.enable = true;
diff --git a/examples/microvms-host.nix b/examples/microvms-host.nix
@@ -10,7 +10,7 @@ nixpkgs.lib.nixosSystem {
     # this runs as a MicroVM that nests MicroVMs
     self.nixosModules.microvm
 
-    ({ config, lib, pkgs, ... }:
+    ({ config, lib, ... }:
       let
         inherit (self.lib) hypervisors;
 
@@ -123,18 +123,19 @@ nixpkgs.lib.nixosSystem {
             networkConfig.Bridge = "virbr0";
           };
         };
-        # Allow DHCP server
-        networking.firewall.allowedUDPPorts = [ 67 ];
-        # Allow Internet access
-        networking.nat = {
-          enable = true;
-          enableIPv6 = true;
-          internalInterfaces = [ "virbr0" ];
+        networking = {
+          extraHosts = lib.concatMapStrings (hypervisor: ''
+            ${hypervisorIPv4Addrs.${hypervisor}} ${hypervisor}
+          '') hypervisors;
+          # Allow DHCP server
+          firewall.allowedUDPPorts = [ 67 ];
+          # Allow Internet access
+          nat = {
+            enable = true;
+            enableIPv6 = true;
+            internalInterfaces = [ "virbr0" ];
+          };
         };
-
-        networking.extraHosts = lib.concatMapStrings (hypervisor: ''
-          ${hypervisorIPv4Addrs.${hypervisor}} ${hypervisor}
-        '') hypervisors;
       })
   ];
 }
diff --git a/examples/qemu-vnc.nix b/examples/qemu-vnc.nix
@@ -16,7 +16,7 @@ nixpkgs.lib.nixosSystem {
     # this runs as a MicroVM
     self.nixosModules.microvm
 
-    ({ config, lib, pkgs, ... }: {
+    ({ lib, pkgs, ... }: {
       microvm = {
         hypervisor = "qemu";
         graphics.enable = true;
diff --git a/flake.nix b/flake.nix
@@ -130,7 +130,7 @@
         lib = import ./lib { inherit (nixpkgs) lib; };
 
         overlay = final: super: {
-          cloud-hypervisor-graphics = import "${spectrum}/pkgs/cloud-hypervisor" { inherit final super; }; 
+          cloud-hypervisor-graphics = import "${spectrum}/pkgs/cloud-hypervisor" { inherit final super; };
         };
         overlays.default = self.overlay;
 
@@ -160,34 +160,36 @@
                 inherit system;
                 modules = [
                   self.nixosModules.microvm
-                  ({ config, lib, ... }: {
+                  ({ lib, ... }: {
                     system.stateVersion = lib.trivial.release;
 
                     networking.hostName = "${hypervisor}-microvm";
                     services.getty.autologinUser = "root";
 
                     nixpkgs.overlays = [ self.overlay ];
-                    microvm.hypervisor = hypervisor;
-                    # share the host's /nix/store if the hypervisor can do 9p
-                    microvm.shares = lib.optional (builtins.elem hypervisor hypervisorsWith9p) {
-                      tag = "ro-store";
-                      source = "/nix/store";
-                      mountPoint = "/nix/.ro-store";
-                    };
-                    # microvm.writableStoreOverlay = "/nix/.rw-store";
-                    # microvm.volumes = [ {
-                    #   image = "nix-store-overlay.img";
-                    #   mountPoint = config.microvm.writableStoreOverlay;
-                    #   size = 2048;
-                    # } ];
-                    microvm.interfaces = lib.optional (builtins.elem hypervisor hypervisorsWithUserNet) {
-                      type = "user";
-                      id = "qemu";
-                      mac = "02:00:00:01:01:01";
-                    };
-                    microvm.forwardPorts = lib.optional (hypervisor == "qemu") {
-                      host.port = 2222;
-                      guest.port = 22;
+                    microvm = {
+                      inherit hypervisor;
+                      # share the host's /nix/store if the hypervisor can do 9p
+                      shares = lib.optional (builtins.elem hypervisor hypervisorsWith9p) {
+                        tag = "ro-store";
+                        source = "/nix/store";
+                        mountPoint = "/nix/.ro-store";
+                      };
+                      # writableStoreOverlay = "/nix/.rw-store";
+                      # volumes = [ {
+                      #   image = "nix-store-overlay.img";
+                      #   mountPoint = config.microvm.writableStoreOverlay;
+                      #   size = 2048;
+                      # } ];
+                      interfaces = lib.optional (builtins.elem hypervisor hypervisorsWithUserNet) {
+                        type = "user";
+                        id = "qemu";
+                        mac = "02:00:00:01:01:01";
+                      };
+                      forwardPorts = lib.optional (hypervisor == "qemu") {
+                        host.port = 2222;
+                        guest.port = 22;
+                      };
                     };
                     networking.firewall.allowedTCPPorts = lib.optional (hypervisor == "qemu") 22;
                     services.openssh = lib.optionalAttrs (hypervisor == "qemu") {
@@ -209,14 +211,16 @@
                 nixpkgs.lib.optionalAttrs (builtins.elem hypervisor self.lib.hypervisorsWithNetwork) {
                   "${system}-${hypervisor}-example-with-tap" = makeExample {
                     inherit system hypervisor;
-                    config = { lib, ...}: {
+                    config = _: {
                       microvm.interfaces = [ {
                         type = "tap";
                         id = "vm-${builtins.substring 0 4 hypervisor}";
                         mac = "02:00:00:01:01:0${toString n}";
                       } ];
-                      networking.interfaces.eth0.useDHCP = true;
-                      networking.firewall.allowedTCPPorts = [ 22 ];
+                      networking = {
+                        interfaces.eth0.useDHCP = true;
+                        firewall.allowedTCPPorts = [ 22 ];
+                      };
                       services.openssh = {
                         enable = true;
                         settings.PermitRootLogin = "yes";
diff --git a/lib/default.nix b/lib/default.nix
@@ -14,7 +14,7 @@ rec {
 
   defaultFsType = "ext4";
 
-  withDriveLetters = { volumes, hypervisor, storeOnDisk, ... }:
+  withDriveLetters = { volumes, storeOnDisk, ... }:
     let
       offset =
         if storeOnDisk
diff --git a/lib/runners/stratovirt.nix b/lib/runners/stratovirt.nix
@@ -124,7 +124,7 @@ in {
       }"
     ]) (enumerate 0 volumes) ++
     lib.optionals (shares != []) (
-      builtins.concatMap ({ proto, index, socket, source, tag, ... }: {
+      builtins.concatMap ({ proto, index, socket, tag, ... }: {
         "virtiofs" = [
           "-chardev"
           "socket,id=fs${toString index},path=${socket}"
diff --git a/nixos-modules/microvm/graphics.nix b/nixos-modules/microvm/graphics.nix
@@ -2,9 +2,9 @@
 
 let
   # TODO: did not get sommelier to work
-  run-sommelier = with pkgs; writeShellScriptBin "run-sommelier" ''
-    exec ${lib.getExe sommelier} --virtgpu-channel -- $@
-  '';
+  # run-sommelier = with pkgs; writeShellScriptBin "run-sommelier" ''
+  #   exec ${lib.getExe sommelier} --virtgpu-channel -- $@
+  # '';
   # Working: run Wayland applications prefixed with `run-wayland-proxy`
   run-wayland-proxy = with pkgs; writeShellScriptBin "run-wayland-proxy" ''
     exec ${lib.getExe wayland-proxy-virtwl} --virtio-gpu -- $@
@@ -17,7 +17,7 @@ in
 lib.mkIf config.microvm.graphics.enable {
   boot.kernelModules = [ "drm" "virtio_gpu" ];
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = [
     #run-sommelier
     run-wayland-proxy
     run-waypipe
diff --git a/nixos-modules/microvm/store-disk.nix b/nixos-modules/microvm/store-disk.nix
@@ -5,8 +5,6 @@ let
     rootPaths = [ config.system.build.toplevel ];
   };
 
-  kernelAtLeast = lib.versionAtLeast config.boot.kernelPackages.kernel.version;
-
   erofs-utils =
     # Are any extended options specified?
     if lib.any (with lib; flip elem ["-Ededupe" "-Efragments"]) config.microvm.storeDiskErofsFlags
diff --git a/nixos-modules/microvm/virtiofsd/default.nix b/nixos-modules/microvm/virtiofsd/default.nix
@@ -27,7 +27,7 @@ in
             events = "PROCESS_STATE";
           };
         } // builtins.listToAttrs (
-          map ({ proto, tag, socket, source, ... }: {
+          map ({ tag, socket, source, ... }: {
             name = "program:virtiofsd-${tag}";
             value = {
               stderr_syslog = true;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{ self, nixpkgs, system, makeTestConfigs }:`
	`1`	`+{ nixpkgs, system, makeTestConfigs, ... }:`
`2`	`2`
`3`	`3`	`let`
`4`	`4`	`pkgs = nixpkgs.legacyPackages.${system};`