diff options
| author | Fabian Affolter <fabian@affolter-engineering.ch> | 2022-10-06 09:39:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-06 09:39:43 +0200 |
| commit | 6a809d73e9495ab9b8167f1b2c6bb9e7b1d208b9 (patch) | |
| tree | 4741e7c0a5e6968a0b658d5aa60d144e9a771b2c /pkgs/tools | |
| parent | 1db5a128ed524fa2d7a23d627cf99d06137a46de (diff) | |
| parent | 11075c265858ba094c49c4bb60e13b922697df7e (diff) | |
Merge pull request #194216 from erdnaxe/maigret-update
maigret: 0.4.3 -> 0.4.4
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/security/maigret/default.nix | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/tools/security/maigret/default.nix b/pkgs/tools/security/maigret/default.nix index 05ea8dcf3df8a..0b9b37225016c 100644 --- a/pkgs/tools/security/maigret/default.nix +++ b/pkgs/tools/security/maigret/default.nix @@ -1,19 +1,21 @@ { lib +, stdenv , fetchFromGitHub , python3 }: python3.pkgs.buildPythonApplication rec { pname = "maigret"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "soxoj"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-0Ni4rXVu3ZQyHBvD3IpV0i849CnumLj+n6/g4sMhHEs="; + hash = "sha256-Z8SnA7Z5+oKW0AOaNf+c/zR30lrPFmXaxxKkbnDXNNs="; }; + nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ aiodns aiohttp @@ -24,6 +26,7 @@ python3.pkgs.buildPythonApplication rec { beautifulsoup4 certifi chardet + cloudscraper colorama future html5lib @@ -60,14 +63,8 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; - postPatch = '' - # Remove all version pinning - sed -i -e "s/==[0-9.]*//" requirements.txt - - # We are not build for Python < 3.7 - substituteInPlace requirements.txt \ - --replace "future-annotations" "" - ''; + pythonRelaxDeps = true; + pythonRemoveDeps = [ "future-annotations" ]; pytestFlagsArray = [ # DeprecationWarning: There is no current event loop @@ -82,6 +79,10 @@ python3.pkgs.buildPythonApplication rec { "test_pdf_report" "test_self_check_db_negative_enabled" "test_self_check_db_positive_enable" + ] ++ lib.optionals stdenv.isDarwin [ + # AsyncioProgressbarExecutor is slower on darwin than it should be, + # Upstream issue: https://github.com/soxoj/maigret/issues/679 + "test_asyncio_progressbar_executor" ]; pythonImportsCheck = [ |