File tree Expand file tree Collapse file tree 2 files changed +12
-1
lines changed Expand file tree Collapse file tree 2 files changed +12
-1
lines changed Original file line number Diff line number Diff line change 5656        isFlake =  flake  !=  null ; 
5757        guestConfig =  if  isFlake 
5858                      then  flake . nixosConfigurations . ${ name } . config 
59-                       else  microvmConfig . config . config ; 
59+                       else  if  microvmConfig . evaluatedConfig !=  null 
60+                         then  microvmConfig . evaluatedConfig . config 
61+                         else  microvmConfig . config . config ; 
6062        runner =  guestConfig . microvm . declaredRunner ; 
6163      in 
6264    { 
Original file line number Diff line number Diff line change 2525    vms =  mkOption { 
2626      type =  with  types ;  attrsOf ( submodule ( {  config ,  name ,  ... } : { 
2727        options =  { 
28+           evaluatedConfig =  mkOption { 
29+             description =  '' 
30+               The evaluated configuration of this MicroVM, as a NixOS 
31+               module, for building **with** a flake. 
32+             '' ; 
33+             default =  null ; 
34+             type =  nullOr types . unspecified ; 
35+           } ; 
36+ 
2837          config =  mkOption { 
2938            description =  '' 
3039              A specification of the desired configuration of this MicroVM, 
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments