Merge pull request #218388 from marsam/fix-pythonImportsCheck-usage

treewide: fix pythonImportsCheck usage

pkgs/development/libraries/science/math/faiss/default.nix

@@ -131,7 +131,7 @@ stdenv.mkDerivation {
   '';
 
   # Need buildPythonPackage for this one
-  # pythonCheckImports = [
+  # pythonImportsCheck = [
   #   "faiss"
   # ];
 

pkgs/development/python-modules/dvc-azure/default.nix

@@ -2,6 +2,7 @@
 , adlfs
 , azure-identity
 , buildPythonPackage
+, dvc-objects
 , fetchPypi
 , knack
 , pythonRelaxDepsHook
@@ -23,13 +24,13 @@ buildPythonPackage rec {
   nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];
 
   propagatedBuildInputs = [
-    adlfs azure-identity knack
+    adlfs azure-identity dvc-objects knack
   ];
 
   # Network access is needed for tests
   doCheck = false;
 
-  pythonCheckImports = [ "dvc_azure" ];
+  pythonImportsCheck = [ "dvc_azure" ];
 
   meta = with lib; {
     description = "azure plugin for dvc";

pkgs/development/python-modules/dvc-gs/default.nix

@@ -26,7 +26,7 @@ buildPythonPackage rec {
   # Network access is needed for tests
   doCheck = false;
 
-  pythonCheckImports = [ "dvc_gs" ];
+  pythonImportsCheck = [ "dvc_gs" ];
 
   meta = with lib; {
     description = "gs plugin for dvc";

pkgs/development/python-modules/dvc-s3/default.nix

@@ -2,6 +2,7 @@
 , aiobotocore
 , boto3
 , buildPythonPackage
+, dvc-objects
 , fetchPypi
 , flatten-dict
 , pythonRelaxDepsHook
@@ -29,13 +30,13 @@ buildPythonPackage rec {
   nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];
 
   propagatedBuildInputs = [
-    aiobotocore boto3 flatten-dict s3fs
+    aiobotocore boto3 dvc-objects flatten-dict s3fs
   ];
 
   # Network access is needed for tests
   doCheck = false;
 
-  pythonCheckImports = [ "dvc_s3" ];
+  pythonImportsCheck = [ "dvc_s3" ];
 
   meta = with lib; {
     description = "s3 plugin for dvc";

pkgs/development/python-modules/dvc-ssh/default.nix

@@ -1,6 +1,7 @@
 { lib
 , bcrypt
 , buildPythonPackage
+, dvc-objects
 , fetchPypi
 , pythonRelaxDepsHook
 , setuptools-scm
@@ -22,7 +23,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];
 
-  propagatedBuildInputs = [ bcrypt sshfs ];
+  propagatedBuildInputs = [ bcrypt dvc-objects sshfs ];
 
   # bcrypt is enabled for sshfs in nixpkgs
   postPatch = ''
@@ -32,7 +33,7 @@ buildPythonPackage rec {
   # Network access is needed for tests
   doCheck = false;
 
-  pythonCheckImports = [ "dvc_ssh" ];
+  pythonImportsCheck = [ "dvc_ssh" ];
 
   meta = with lib; {
     description = "ssh plugin for dvc";

pkgs/development/python-modules/gpaw/default.nix

@@ -14,6 +14,7 @@
 , numpy
 , scipy
 , pyyaml
+, inetutils
 }:
 
 assert lib.asserts.assertMsg (!blas.isILP64)
@@ -82,7 +83,10 @@ in buildPythonPackage rec {
     hash = "sha256-Kgf8yuGua7mcGP+jVVmbE8JCsbrfzewRTRt3ihq9YX4=";
   };
 
-  nativeBuildInputs = [ which ];
+  # `inetutils` is required because importing `gpaw`, as part of
+  # pythonImportsCheck, tries to execute its binary, which in turn tries to
+  # execute `rsh` as a side-effect.
+  nativeBuildInputs = [ which inetutils ];
 
   buildInputs = [ blas scalapack libxc libvdwxc ];
 
@@ -110,7 +114,7 @@ in buildPythonPackage rec {
   '';
 
   doCheck = false; # Requires MPI runtime to work in the sandbox
-  pythonImportsCheckHook = [ "gpaw" ];
+  pythonImportsCheck = [ "gpaw" ];
 
   passthru = { inherit mpi; };
 

pkgs/development/python-modules/netcdf4/default.nix

@@ -50,7 +50,7 @@ buildPythonPackage rec {
   CURL_DIR = curl.dev;
   JPEG_DIR = libjpeg.dev;
 
-  pythonImportsCheckHook = [ "netcdf4" ];
+  pythonImportsCheck = [ "netCDF4" ];
 
   meta = with lib; {
     description = "Interface to netCDF library (versions 3 and 4)";

pkgs/development/python-modules/posix_ipc/default.nix

@@ -18,7 +18,7 @@ buildPythonPackage rec {
     hash = "sha256-xK5CkThqVFVMIxBtgUfHIRNRfmBxKa/DWBYQg7QHl/M=";
   };
 
-  pythonImportsCheckHook = [
+  pythonImportsCheck = [
     "posix_ipc"
   ];
 

pkgs/development/python-modules/tensorrt/default.nix

@@ -38,7 +38,7 @@ buildPythonPackage rec {
     cudaPackages.tensorrt
   ];
 
-  pythonCheckImports = [
+  pythonImportsCheck = [
     "tensorrt"
   ];
 

pkgs/tools/misc/apt-offline/default.nix

@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
 
   doCheck = false;
 
-  pythonimportsCheck = [ "apt-offline" ];
+  pythonImportsCheck = [ "apt_offline_core" ];
 
   passthru.updateScript = nix-update-script { };