qboot: 20200423 -> 20220919; nixos/tests/qboot: switch from deprecated handleTestOn to runTestOn

nixos/tests/all-tests.nix

@@ -1358,7 +1358,7 @@ in
   pulseaudio-tcp = runTest ./pulseaudio-tcp.nix;
   pykms = runTest ./pykms.nix;
   qbittorrent = runTest ./qbittorrent.nix;
-  qboot = handleTestOn [ "x86_64-linux" "i686-linux" ] ./qboot.nix { };
+  qboot = runTestOn [ "x86_64-linux" "i686-linux" ] ./qboot.nix;
   qemu-vm-credentials-fwcfg = runTest {
     imports = [ ./qemu-vm-credentials.nix ];
     _module.args.mechanism = "fw_cfg";

nixos/tests/qboot.nix

@@ -1,17 +1,15 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "qboot";
+{ pkgs, ... }:
+{
+  name = "qboot";
 
-    nodes.machine =
-      { ... }:
-      {
-        virtualisation.bios = pkgs.qboot;
-      };
+  nodes.machine =
+    { ... }:
+    {
+      virtualisation.bios = pkgs.qboot;
+    };
 
-    testScript = ''
-      start_all()
-      machine.wait_for_unit("multi-user.target")
-    '';
-  }
-)
+  testScript = ''
+    start_all()
+    machine.wait_for_unit("multi-user.target")
+  '';
+}

pkgs/applications/virtualization/qboot/default.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "qboot";
-  version = "unstable-2020-04-23";
+  version = "unstable-2022-09-19";
 
   src = fetchFromGitHub {
     owner = "bonzini";
     repo = "qboot";
-    rev = "de50b5931c08f5fba7039ddccfb249a5b3b0b18d";
-    sha256 = "1d0h29zz535m0pq18k3aya93q7lqm2858mlcp8mlfkbq54n8c5d8";
+    rev = "8ca302e86d685fa05b16e2b208888243da319941";
+    hash = "sha256-YxVGFiyLdhq7yWaXARh7f0nBZgXfJuYvv1BxfyThupM=";
   };
 
   nativeBuildInputs = [
@@ -33,9 +33,7 @@ stdenv.mkDerivation {
     "pic"
   ];
 
-  passthru.tests = {
-    qboot = nixosTests.qboot;
-  };
+  passthru.tests.qboot = nixosTests.qboot;
 
   meta = {
     description = "Simple x86 firmware for booting Linux";