diff --git a/pkgs/development/python-modules/django-webpush/default.nix b/pkgs/development/python-modules/django-webpush/default.nix index 44d670dfeede..5f04dccb1ca6 100644 --- a/pkgs/development/python-modules/django-webpush/default.nix +++ b/pkgs/development/python-modules/django-webpush/default.nix @@ -22,17 +22,21 @@ buildPythonPackage rec { hash = "sha256-Mwp53apdPpBcn7VfDbyDlvLAVAG65UUBhT0w9OKjKbU="; }; - nativeBuildInputs = [ + pythonRelaxDeps = [ + "pywebpush" + ]; + + build-system = [ pythonRelaxDepsHook setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ django pywebpush ]; - # nothing to test + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -40,7 +44,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A Package made for integrating and sending Web Push Notification in Django Application"; + description = "Module for integrating and sending Web Push Notification in Django Application"; homepage = "https://github.com/safwanrahman/django-webpush/"; changelog = "https://github.com/safwanrahman/django-webpush/releases/tag/${src.rev}"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index 903ad646b8b5..ebb3313b20c5 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -1,28 +1,36 @@ { lib -, fetchPypi +, aiohttp , buildPythonPackage , cryptography +, fetchPypi , http-ece -, py-vapid -, requests -, six -, coverage -, flake8 , mock +, py-vapid , pytestCheckHook +, pythonOlder +, requests +, setuptools +, six }: buildPythonPackage rec { pname = "pywebpush"; - version = "1.14.1"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+I1+K/XofGFt+wS4yVwRkjjFEWWbAvc17nfMFoQoVe4="; + hash = "sha256-A8zD6XW2A3S3Y0xJVZVha+Ujvyx9oNl26E/amsjGMwE="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ + aiohttp cryptography http-ece py-vapid @@ -31,19 +39,20 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - coverage - flake8 mock pytestCheckHook ]; - pythonImportsCheck = [ "pywebpush" ]; + pythonImportsCheck = [ + "pywebpush" + ]; meta = with lib; { description = "Webpush Data encryption library for Python"; - mainProgram = "pywebpush"; homepage = "https://github.com/web-push-libs/pywebpush"; + changelog = "https://github.com/web-push-libs/pywebpush/releases/tag/${version}"; license = licenses.mpl20; maintainers = with maintainers; [ peterhoeg ]; + mainProgram = "pywebpush"; }; }