test driver: normalize callpackage call (NixOS#468717)

Author: roberth

nixos/lib/test-driver/default.nix

@@ -1,41 +1,50 @@
 {
   lib,
-  python3Packages,
-  enableOCR ? false,
-  qemu_pkg ? qemu_test,
+
+  buildPythonApplication,
+  colorama,
   coreutils,
   imagemagick_light,
+  ipython,
+  junit-xml,
+  mypy,
+  ptpython,
+  python,
+  ruff,
+  remote-pdb,
+
   netpbm,
+  nixosTests,
+  qemu_pkg ? qemu_test,
   qemu_test,
+  setuptools,
   socat,
-  ruff,
   tesseract4,
   vde2,
+
+  enableOCR ? false,
   extraPythonPackages ? (_: [ ]),
-  nixosTests,
 }:
 
-python3Packages.buildPythonApplication {
+buildPythonApplication {
   pname = "nixos-test-driver";
   version = "1.1";
   pyproject = true;
 
   src = ./src;
 
-  build-system = with python3Packages; [
+  build-system = [
     setuptools
   ];
 
-  dependencies =
-    with python3Packages;
-    [
-      colorama
-      junit-xml
-      ptpython
-      ipython
-      remote-pdb
-    ]
-    ++ extraPythonPackages python3Packages;
+  dependencies = [
+    colorama
+    ipython
+    junit-xml
+    ptpython
+    remote-pdb
+  ]
+  ++ extraPythonPackages python.pkgs;
 
   propagatedBuildInputs = [
     coreutils
@@ -55,7 +64,7 @@ python3Packages.buildPythonApplication {
 
   doCheck = true;
 
-  nativeCheckInputs = with python3Packages; [
+  nativeCheckInputs = [
     mypy
     ruff
   ];

nixos/lib/testing/driver.nix

@@ -9,7 +9,7 @@ let
 
   # Reifies and correctly wraps the python test driver for
   # the respective qemu version and with or without ocr support
-  testDriver = hostPkgs.callPackage ../test-driver {
+  testDriver = hostPkgs.python3Packages.callPackage ../test-driver {
     inherit (config) enableOCR extraPythonPackages;
     qemu_pkg = config.qemu.package;
     imagemagick_light = hostPkgs.imagemagick_light.override { inherit (hostPkgs) libtiff; };