From 0bc6b3e997704f0ce3579cf434cab07b2e6c8d89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 11:16:11 +0100 Subject: [PATCH 1/5] python310Packages.flask-autoindex: normalize pname --- pkgs/development/python-modules/flask-autoindex/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix index fff8859e86e0..ee6259d1e901 100644 --- a/pkgs/development/python-modules/flask-autoindex/default.nix +++ b/pkgs/development/python-modules/flask-autoindex/default.nix @@ -9,11 +9,12 @@ }: buildPythonPackage rec { - pname = "Flask-AutoIndex"; + pname = "flask-autoindex"; version = "0.6.6"; src = fetchPypi { - inherit pname version; + pname = "Flask-AutoIndex"; + inherit version; sha256 = "ea319f7ccadf68ddf98d940002066278c779323644f9944b300066d50e2effc7"; }; From 1f5555d0c4fe58d623e9d2ef5644f7a20ae3f831 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 11:17:11 +0100 Subject: [PATCH 2/5] python310Packages.flask-autoindex: add pythonImportsCheck --- pkgs/development/python-modules/flask-autoindex/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix index ee6259d1e901..bba2d7a07fd2 100644 --- a/pkgs/development/python-modules/flask-autoindex/default.nix +++ b/pkgs/development/python-modules/flask-autoindex/default.nix @@ -26,6 +26,10 @@ buildPythonPackage rec { pathlib ]; + pythonImportsCheck = [ + "flask_autoindex" + ]; + meta = with lib; { description = "The mod_autoindex for Flask"; longDescription = '' From 5bf951f9f86d41204c5de2c77268a875ab58f9ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 11:20:19 +0100 Subject: [PATCH 3/5] python310Packages.flask-autoindex: update homepage and add changelog --- pkgs/development/python-modules/flask-autoindex/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix index bba2d7a07fd2..d770ce55c8c8 100644 --- a/pkgs/development/python-modules/flask-autoindex/default.nix +++ b/pkgs/development/python-modules/flask-autoindex/default.nix @@ -36,8 +36,9 @@ buildPythonPackage rec { Flask-AutoIndex generates an index page for your Flask application automatically. The result is just like mod_autoindex, but the look is more awesome! ''; + homepage = "https://flask-autoindex.readthedocs.io/"; + changelog = "https://github.com/general03/flask-autoindex/blob/v${version}/CHANGELOG.md"; license = licenses.bsd2; maintainers = teams.sage.members; - homepage = "https://pythonhosted.org/Flask-AutoIndex/"; }; } From b958cbfeac0c4805d2ddda309d0a0addde3e66f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 11:22:28 +0100 Subject: [PATCH 4/5] python310Packages.flask-autoindex: disable on unsupported Python releases --- .../python-modules/flask-autoindex/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix index d770ce55c8c8..5ca5f21e2eb7 100644 --- a/pkgs/development/python-modules/flask-autoindex/default.nix +++ b/pkgs/development/python-modules/flask-autoindex/default.nix @@ -1,16 +1,17 @@ { lib , buildPythonPackage -, pythonOlder , fetchPypi , flask , flask-silk -, future -, pathlib +, pythonOlder }: buildPythonPackage rec { pname = "flask-autoindex"; version = "0.6.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Flask-AutoIndex"; @@ -21,9 +22,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask flask-silk - future - ] ++ lib.optionals (pythonOlder "3.4") [ - pathlib ]; pythonImportsCheck = [ From c7708e48490f6aacb2e6b2368380d0c515823491 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 11:39:47 +0100 Subject: [PATCH 5/5] python310Packages.flask-autoindex: mark as broken Test suite fails with current Flask https://github.com/general03/flask-autoindex/issues/67 --- .../python-modules/flask-autoindex/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix index 5ca5f21e2eb7..c8e14eaf35e3 100644 --- a/pkgs/development/python-modules/flask-autoindex/default.nix +++ b/pkgs/development/python-modules/flask-autoindex/default.nix @@ -3,7 +3,9 @@ , fetchPypi , flask , flask-silk +, future , pythonOlder +, unittestCheckHook }: buildPythonPackage rec { @@ -22,6 +24,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask flask-silk + future + ]; + + nativeCheckInputs = [ + unittestCheckHook ]; pythonImportsCheck = [ @@ -38,5 +45,7 @@ buildPythonPackage rec { changelog = "https://github.com/general03/flask-autoindex/blob/v${version}/CHANGELOG.md"; license = licenses.bsd2; maintainers = teams.sage.members; + # https://github.com/general03/flask-autoindex/issues/67 + broken = true; }; }