Set microvm nixpkgs path

Signed-off-by: Henri Rosten <[email protected]>
tiiuae · Jan 31, 2025 · 5c272bc · 5c272bc
1 parent c9b576c
commit 5c272bc
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 1 deletion.
diff --git a/modules/microvm/flake-module.nix b/modules/microvm/flake-module.nix
@@ -11,7 +11,7 @@
       (import ./virtualization/microvm/appvm.nix { inherit inputs; })
       (import ./virtualization/microvm/guivm.nix { inherit inputs; })
       (import ./virtualization/microvm/audiovm.nix { inherit inputs; })
-      ./virtualization/microvm/idsvm/idsvm.nix
+      (import ./virtualization/microvm/idsvm/idsvm.nix { inherit inputs; })
       ./virtualization/microvm/idsvm/mitmproxy
       ./virtualization/microvm/modules.nix
       ./networking.nix

diff --git a/modules/microvm/virtualization/microvm/adminvm.nix b/modules/microvm/virtualization/microvm/adminvm.nix
@@ -145,6 +145,7 @@ in
   config = lib.mkIf cfg.enable {
     microvm.vms."${vmName}" = {
       autostart = true;
+      inherit (inputs) nixpkgs;
       config = adminvmBaseConfiguration // {
         imports = adminvmBaseConfiguration.imports ++ cfg.extraModules;
       };

diff --git a/modules/microvm/virtualization/microvm/appvm.nix b/modules/microvm/virtualization/microvm/appvm.nix
@@ -228,6 +228,7 @@ let
     in
     {
       autostart = true;
+      inherit (inputs) nixpkgs;
       config = appvmConfiguration // {
         imports = appvmConfiguration.imports ++ cfg.extraModules ++ vm.extraModules ++ appExtraModules;
       };

diff --git a/modules/microvm/virtualization/microvm/audiovm.nix b/modules/microvm/virtualization/microvm/audiovm.nix
@@ -148,6 +148,7 @@ in
   config = lib.mkIf cfg.enable {
     microvm.vms."${vmName}" = {
       autostart = true;
+      inherit (inputs) nixpkgs;
       config = audiovmBaseConfiguration // {
         imports = audiovmBaseConfiguration.imports ++ cfg.extraModules;
       };

diff --git a/modules/microvm/virtualization/microvm/guivm.nix b/modules/microvm/virtualization/microvm/guivm.nix
@@ -351,6 +351,7 @@ in
   config = lib.mkIf cfg.enable {
     microvm.vms."${vmName}" = {
       autostart = true;
+      inherit (inputs) nixpkgs;
       config = guivmBaseConfiguration // {
         boot.kernelPackages =
           if config.ghaf.guest.kernel.hardening.graphics.enable then

diff --git a/modules/microvm/virtualization/microvm/idsvm/idsvm.nix b/modules/microvm/virtualization/microvm/idsvm/idsvm.nix
@@ -1,5 +1,6 @@
 # Copyright 2022-2023 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
+{ inputs }:
 {
   config,
   lib,
@@ -89,6 +90,7 @@ in
   config = lib.mkIf cfg.enable {
     microvm.vms."${vmName}" = {
       autostart = true;
+      inherit (inputs) nixpkgs;
       config = idsvmBaseConfiguration // {
         imports = idsvmBaseConfiguration.imports ++ cfg.extraModules;
       };

diff --git a/modules/microvm/virtualization/microvm/netvm.nix b/modules/microvm/virtualization/microvm/netvm.nix
@@ -163,6 +163,7 @@ in
     microvm.vms."${vmName}" = {
       autostart = true;
       restartIfChanged = false;
+      inherit (inputs) nixpkgs;
       config = netvmBaseConfiguration // {
         imports = netvmBaseConfiguration.imports ++ cfg.extraModules;
       };