Merge pull request #56675 from terlar/pykeepass-fix-build

pythonPackages.pykeepass: fix build
NixOS · Mar 2, 2019 · e43f236 · e43f236
2 parents f70f3b3 + d9b1bfa
commit e43f236
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix
@@ -1,30 +1,33 @@
 { cffi
 , six
+, enum34
 , hypothesis
 , pytest
 , wheel
 , buildPythonPackage
 , fetchPypi
+, isPy3k
+, lib
 }:
 
 buildPythonPackage rec {
   pname = "argon2_cffi";
   version = "19.1.0";
-  name    = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "81548a27b919861040cb928a350733f4f9455dd67c7d1ba92eb5960a1d7f8b26";
   };
 
-  propagatedBuildInputs = [ cffi six ];
+  propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34;
   checkInputs = [ hypothesis pytest wheel ];
   checkPhase = ''
     pytest tests
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Secure Password Hashes for Python";
     homepage    = https://argon2-cffi.readthedocs.io/;
+    license     = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix
@@ -1,6 +1,6 @@
 { lib, fetchPypi, buildPythonPackage
 , lxml, pycryptodome, construct
-, argon2_cffi, dateutil, enum34
+, argon2_cffi, dateutil, future
 }:
 
 buildPythonPackage rec {
@@ -14,9 +14,12 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     lxml pycryptodome construct
-    argon2_cffi dateutil enum34
+    argon2_cffi dateutil future
   ];
 
+  # no tests in PyPI tarball
+  doCheck = false;
+
   meta = {
     homepage = https://github.com/pschmitt/pykeepass;
     description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)";