Fix deadnix

Author: SuperSandro2000

checks/shutdown-command.nix

@@ -1,4 +1,4 @@
-{ self, nixpkgs, system, makeTestConfigs }:
+{ nixpkgs, system, makeTestConfigs, ... }:
 
 let
   pkgs = nixpkgs.legacyPackages.${system};

checks/startup-shutdown.nix

@@ -1,4 +1,4 @@
-{ self, nixpkgs, system, makeTestConfigs }:
+{ nixpkgs, system, makeTestConfigs, ... }:
 
 let
   pkgs = nixpkgs.legacyPackages.${system};

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;

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;
 

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;

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,7 +160,7 @@
                 inherit system;
                 modules = [
                   self.nixosModules.microvm
-                  ({ config, lib, ... }: {
+                  ({ lib, ... }: {
                     system.stateVersion = lib.trivial.release;
 
                     networking.hostName = "${hypervisor}-microvm";
@@ -209,7 +209,7 @@
                 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}";

lib/default.nix

@@ -14,7 +14,7 @@ rec {
 
   defaultFsType = "ext4";
 
-  withDriveLetters = { volumes, hypervisor, storeOnDisk, ... }:
+  withDriveLetters = { volumes, storeOnDisk, ... }:
     let
       offset =
         if storeOnDisk

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}"

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

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