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

pythonPackages.pykeepass: fix build
This commit is contained in:
Robert Schütz 2019-03-02 11:18:19 +01:00 committed by GitHub
commit e43f2369ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions

View File

@ -1,30 +1,33 @@
{ cffi { cffi
, six , six
, enum34
, hypothesis , hypothesis
, pytest , pytest
, wheel , wheel
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, isPy3k
, lib
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "argon2_cffi"; pname = "argon2_cffi";
version = "19.1.0"; version = "19.1.0";
name = "${pname}-${version}";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "81548a27b919861040cb928a350733f4f9455dd67c7d1ba92eb5960a1d7f8b26"; sha256 = "81548a27b919861040cb928a350733f4f9455dd67c7d1ba92eb5960a1d7f8b26";
}; };
propagatedBuildInputs = [ cffi six ]; propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34;
checkInputs = [ hypothesis pytest wheel ]; checkInputs = [ hypothesis pytest wheel ];
checkPhase = '' checkPhase = ''
pytest tests pytest tests
''; '';
meta = { meta = with lib; {
description = "Secure Password Hashes for Python"; description = "Secure Password Hashes for Python";
homepage = https://argon2-cffi.readthedocs.io/; homepage = https://argon2-cffi.readthedocs.io/;
license = licenses.mit;
}; };
} }

View File

@ -1,6 +1,6 @@
{ lib, fetchPypi, buildPythonPackage { lib, fetchPypi, buildPythonPackage
, lxml, pycryptodome, construct , lxml, pycryptodome, construct
, argon2_cffi, dateutil, enum34 , argon2_cffi, dateutil, future
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -14,9 +14,12 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
lxml pycryptodome construct lxml pycryptodome construct
argon2_cffi dateutil enum34 argon2_cffi dateutil future
]; ];
# no tests in PyPI tarball
doCheck = false;
meta = { meta = {
homepage = https://github.com/pschmitt/pykeepass; homepage = https://github.com/pschmitt/pykeepass;
description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)"; description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)";