From 0bd03df628cb70a26980babab04edf2e42cbe9ad Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 4 Jun 2024 20:23:02 +0900 Subject: [PATCH 1/2] python311Packages.flask-principal: refactor and remove nose --- .../flask-principal/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix index dcde78d30e2d..9b54c14e9556 100644 --- a/pkgs/development/python-modules/flask-principal/default.nix +++ b/pkgs/development/python-modules/flask-principal/default.nix @@ -1,29 +1,37 @@ { lib, buildPythonPackage, - fetchPypi, - flask, + fetchFromGitHub, blinker, - nose, + flask, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "flask-principal"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - pname = "Flask-Principal"; - inherit version; - hash = "sha256-9dYTS1yuv9u4bzLVbRjuRLCAh2onJpVgqW6jX3XJlFM="; + src = fetchFromGitHub { + owner = "pallets-eco"; + repo = "flask-principal"; + rev = "refs/tags/${version}"; + hash = "sha256-E9urzZc7/QtzAohSNAJsQtykrplb+MC189VGZI5kmEE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ flask blinker ]; - nativeCheckInputs = [ nose ]; + pythonImportsCheck = [ "flask_principal" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "test_principal.py" ]; meta = with lib; { homepage = "http://packages.python.org/Flask-Principal/"; From 7cfd6b96e27ee4784a18431b9edff97cf9b950d9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 4 Jun 2024 20:24:06 +0900 Subject: [PATCH 2/2] python311Packages.flask-principal: fix license see https://github.com/pallets-eco/flask-principal/blob/0.4.0/LICENSE --- pkgs/development/python-modules/flask-principal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix index 9b54c14e9556..5fe11b282c0d 100644 --- a/pkgs/development/python-modules/flask-principal/default.nix +++ b/pkgs/development/python-modules/flask-principal/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "http://packages.python.org/Flask-Principal/"; description = "Identity management for flask"; - license = licenses.bsd2; + license = licenses.mit; maintainers = with maintainers; [ abbradar ]; }; }