fix VMs on nixos-22.05

examples/deploy-krops.sh

@@ -26,15 +26,17 @@ echo "Building the target VM"
 # Build the initial VM to which the nix-bitcoin node is deployed via krops
 nix-build --out-link $tmpDir/vm - <<'EOF'
 (import <nixpkgs/nixos> {
-  configuration = { lib, ... }: {
+  configuration = { config, lib, ... }: {
     imports = [ <qemu-vm/vm-config.nix>  ];
     services.openssh.enable = true;
 
     # Silence the following warning that appears when deploying via krops:
     # warning: Nix search path entry '/nix/var/nix/profiles/per-user/root/channels' does not exist, ignoring
     nix.nixPath = lib.mkForce [];
+
+    system.stateVersion = config.system.nixos.release;
   };
-}).vm
+}).config.system.build.vm
 EOF
 
 vmNumCPUs=4

examples/deploy-qemu-vm.sh

@@ -31,7 +31,7 @@ nix-build --out-link $tmpDir/vm - <<'EOF'
     ];
     nix-bitcoin.generateSecrets = true;
   };
-}).vm
+}).config.system.build.vm
 EOF
 
 vmNumCPUs=4

examples/qemu-vm/minimal-vm.nix

@@ -13,19 +13,21 @@ rec {
 
   vm = (import "${nixpkgs}/nixos" {
     inherit system;
-    configuration = { lib, ... }: {
+    configuration = { config, lib, modulesPath, ... }: {
       imports = [
         nix-bitcoin.nixosModules.default
         "${nix-bitcoin}/modules/presets/secure-node.nix"
+        "${modulesPath}/virtualisation/qemu-vm.nix"
       ];
 
+      virtualisation.graphics = false;
+
       nix-bitcoin.generateSecrets = true;
       services.clightning.enable = true;
       # For faster startup in offline VMs
       services.clightning.extraConfig = "disable-dns";
 
       nixpkgs.pkgs = pkgs;
-      virtualisation.graphics = false;
       services.getty.autologinUser = "root";
       nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
 
@@ -42,8 +44,10 @@ rec {
       systemd.services."serial-getty@".preStop = ''
         echo o >/proc/sysrq-trigger
       '';
+
+      system.stateVersion = config.system.nixos.release;
     };
-  }).vm;
+  }).config.system.build.vm;
 
   runVM = mkVMScript vm;
 }

examples/qemu-vm/vm-config.nix

@@ -1,7 +1,10 @@
+{ modulesPath, ... }:
 {
   # Disable the hardened preset to improve VM performance
   disabledModules = [ <nix-bitcoin/modules/presets/hardened.nix> ];
 
+  imports = [ "${modulesPath}/virtualisation/qemu-vm.nix" ];
+
   config = {
     virtualisation.graphics = false;
     services.getty.autologinUser = "root";