From d0d1cd1f4ed2a57b7686ffec64f9aebbea81d218 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Feb 2023 04:20:00 +0000 Subject: [PATCH 01/10] python310Packages.posix_ipc: fix pythonImportsCheck usage --- pkgs/development/python-modules/posix_ipc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/posix_ipc/default.nix b/pkgs/development/python-modules/posix_ipc/default.nix index fc97afa36cf5..58f13f20cf03 100644 --- a/pkgs/development/python-modules/posix_ipc/default.nix +++ b/pkgs/development/python-modules/posix_ipc/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-xK5CkThqVFVMIxBtgUfHIRNRfmBxKa/DWBYQg7QHl/M="; }; - pythonImportsCheckHook = [ + pythonImportsCheck = [ "posix_ipc" ]; From d4a1832792089c3d5bc730336c1a31fe60994f34 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Feb 2023 04:20:00 +0000 Subject: [PATCH 02/10] python310Packages.netcdf4: fix pythonImportsCheck usage --- pkgs/development/python-modules/netcdf4/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 63273bfce606..e75315400621 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/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)"; From b5641a8e7c4a1b570c7fc9864c02f416ba1d947b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Feb 2023 04:20:00 +0000 Subject: [PATCH 03/10] python310Packages.gpaw: fix pythonImportsCheck usage --- pkgs/development/python-modules/gpaw/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gpaw/default.nix b/pkgs/development/python-modules/gpaw/default.nix index 0af589decc48..913f1616a07d 100644 --- a/pkgs/development/python-modules/gpaw/default.nix +++ b/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; }; From 9cae03dbcdb0ce6fb5bb904d25caf578ab3b4b41 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Feb 2023 04:20:00 +0000 Subject: [PATCH 04/10] apt-offline: fix pythonImportsCheck usage --- pkgs/tools/misc/apt-offline/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index 4a4929444784..585033068d17 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/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 { }; From bd77a7517c0f6fb7740037b19d737bd03ceefe9c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 May 2023 04:20:00 +0000 Subject: [PATCH 05/10] python310Packages.tensorrt: fix pythonImportsCheck usage --- pkgs/development/python-modules/tensorrt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorrt/default.nix b/pkgs/development/python-modules/tensorrt/default.nix index 30da346c810e..475e7627e4ba 100644 --- a/pkgs/development/python-modules/tensorrt/default.nix +++ b/pkgs/development/python-modules/tensorrt/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { cudaPackages.tensorrt ]; - pythonCheckImports = [ + pythonImportsCheck = [ "tensorrt" ]; From 7b50880a5f6b47e62d374f7c8a5853f03bdafb74 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 May 2023 04:20:00 +0000 Subject: [PATCH 06/10] python310Packages.dvc-ssh: fix pythonImportsCheck usage --- pkgs/development/python-modules/dvc-ssh/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-ssh/default.nix b/pkgs/development/python-modules/dvc-ssh/default.nix index 18391eef75cd..4cdd25629efa 100644 --- a/pkgs/development/python-modules/dvc-ssh/default.nix +++ b/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"; From a49541f0c782a406b551a73390bf5819fe7e59cd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 May 2023 04:20:00 +0000 Subject: [PATCH 07/10] python310Packages.dvc-gs: fix pythonImportsCheck usage --- pkgs/development/python-modules/dvc-gs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dvc-gs/default.nix b/pkgs/development/python-modules/dvc-gs/default.nix index ab16c906ccaf..defbc1ec0de3 100644 --- a/pkgs/development/python-modules/dvc-gs/default.nix +++ b/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"; From 52f9267369b6d23bff90515d16b10877054f32ed Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 May 2023 04:20:00 +0000 Subject: [PATCH 08/10] python310Packages.dvc-azure: fix pythonImportsCheck usage --- pkgs/development/python-modules/dvc-azure/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-azure/default.nix b/pkgs/development/python-modules/dvc-azure/default.nix index 068875dc3199..f9df83fb6526 100644 --- a/pkgs/development/python-modules/dvc-azure/default.nix +++ b/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"; From 5ffbdcdcaaa8fc50142f226f1fd3f1d6981693e3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 May 2023 04:20:00 +0000 Subject: [PATCH 09/10] python310Packages.dvc-s3: fix pythonImportsCheck usage --- pkgs/development/python-modules/dvc-s3/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-s3/default.nix b/pkgs/development/python-modules/dvc-s3/default.nix index effa8e79e0a1..a5d6369376d7 100644 --- a/pkgs/development/python-modules/dvc-s3/default.nix +++ b/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"; From 5ffdf341ffa7d8a91d57ef463c161d47fbf88809 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 May 2023 04:20:00 +0000 Subject: [PATCH 10/10] faiss: fix pythonImportsCheck usage in comment --- pkgs/development/libraries/science/math/faiss/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 2e14b0e0d3a6..d67f31375e7d 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation { ''; # Need buildPythonPackage for this one - # pythonCheckImports = [ + # pythonImportsCheck = [ # "faiss" # ];