diff options
| author | Robert Schütz <nix@dotlambda.de> | 2022-05-03 04:23:51 +0000 |
|---|---|---|
| committer | Robert Schütz <nix@dotlambda.de> | 2022-05-08 20:30:50 +0000 |
| commit | 99ed27107eafcd4bad40d0dbb1b65b92616bb98c (patch) | |
| tree | 476e16b7d70db6550679a90f8e67d6327d33992c | |
| parent | 219573548cbacd9d90126e39093caeb34fcaf6d2 (diff) | |
| download | nixpkgs-99ed27107eafcd4bad40d0dbb1b65b92616bb98c.tar nixpkgs-99ed27107eafcd4bad40d0dbb1b65b92616bb98c.tar.gz nixpkgs-99ed27107eafcd4bad40d0dbb1b65b92616bb98c.tar.bz2 nixpkgs-99ed27107eafcd4bad40d0dbb1b65b92616bb98c.tar.lz nixpkgs-99ed27107eafcd4bad40d0dbb1b65b92616bb98c.tar.xz nixpkgs-99ed27107eafcd4bad40d0dbb1b65b92616bb98c.tar.zst nixpkgs-99ed27107eafcd4bad40d0dbb1b65b92616bb98c.zip | |
python3Packages.passlib: specify extras-require
| -rw-r--r-- | pkgs/development/python-modules/fastapi/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/flask-security-too/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/passlib/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/development/tools/devpi-server/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/radicale/3.x.nix | 2 |
5 files changed, 19 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index c3abc2163be..63071fd9e44 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { pytest-asyncio sqlalchemy trio - ]; + ] ++ passlib.extras-require.bcrypt; patches = [ # Bump starlette, https://github.com/tiangolo/fastapi/pull/4483 diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index 8379ec7bcfe..c3d98e405f3 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -32,6 +32,7 @@ , passlib # tests +, argon2_cffi , flask-mongoengine , mongoengine , mongomock @@ -85,6 +86,7 @@ buildPythonPackage rec { }; checkInputs = [ + argon2_cffi flask-mongoengine mongoengine mongomock diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index ab29ab74d68..9e35fb8f76a 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, nose -, bcrypt , argon2_cffi +, bcrypt +, cryptography +, pytestCheckHook }: buildPythonPackage rec { @@ -15,9 +16,17 @@ buildPythonPackage rec { sha256 = "defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04"; }; - checkInputs = [ nose ]; - propagatedBuildInputs = [ bcrypt argon2_cffi ]; - propagatedNativeBuildInputs = [ argon2_cffi ]; + passthru.extras-require = { + argon2 = [ argon2_cffi ]; + bcrypt = [ bcrypt ]; + totp = [ cryptography ]; + }; + + checkInputs = [ + pytestCheckHook + ] ++ passthru.extras-require.argon2 + ++ passthru.extras-require.bcrypt + ++ passthru.extras-require.totp; meta = with lib; { description = "A password hashing library for Python"; diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 8e78bebebe9..3f89bd4a1c5 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -46,7 +46,7 @@ buildPythonApplication rec { pyramid strictyaml waitress - ]; + ] ++ passlib.extras-require.argon2; checkInputs = [ beautifulsoup4 diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 9867922d852..7171b4550fd 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { passlib vobject python-dateutil - ]; + ] ++ passlib.extras-require.bcrypt; checkInputs = with python3.pkgs; [ pytestCheckHook |