python3Packages.argon2-cffi: remove unnecessary cffi dependencies

argon2-cffi-bindings needs cffi at build time and run time, therefore it has
cffi in nativeBuildInputs and propagatedBuildInputs. argon2-cffi doesn't
directly use cffi, only transitively through argon2-cffi-bindings. This also
removes a problematic usage of propagatedNativeBuildInputs.

Also, add pythonImportsCheck to verify that we have all the necessary
dependencies.

2 files changed, 5 insertions, 8 deletions

diff --git a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix
index 3f1f3f86666cf..1dc4337e26e68 100644
--- a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix
+++ b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix
@@ -16,6 +16,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     setuptools-scm
+    cffi
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/argon2-cffi/default.nix b/pkgs/development/python-modules/argon2-cffi/default.nix
index 2282a06e5c646..0521efc444cdf 100644
--- a/pkgs/development/python-modules/argon2-cffi/default.nix
+++ b/pkgs/development/python-modules/argon2-cffi/default.nix
@@ -1,5 +1,4 @@
-{ cffi
-, six
+{ six
 , enum34
 , hypothesis
 , pytest
@@ -27,14 +26,9 @@ buildPythonPackage rec {
     flit-core
   ];
 
-  propagatedBuildInputs = [ cffi six argon2-cffi-bindings ]
+  propagatedBuildInputs = [ six argon2-cffi-bindings ]
     ++ lib.optional (!isPy3k) enum34;
 
-  propagatedNativeBuildInputs = [
-    argon2-cffi-bindings
-    cffi
-  ];
-
   ARGON2_CFFI_USE_SSE2 = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) "0";
 
   nativeCheckInputs = [ hypothesis pytest wheel ];
@@ -42,6 +36,8 @@ buildPythonPackage rec {
     pytest tests
   '';
 
+  pythonImportsCheck = [ "argon2" ];
+
   meta = with lib; {
     description = "Secure Password Hashes for Python";
     homepage    = "https://argon2-cffi.readthedocs.io/";