diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-06 12:01:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-06 12:01:31 +0000 |
| commit | 8d6fbd734139962d00ca730417a2532f77e150f2 (patch) | |
| tree | 58f6c664954b974d00cb21488565bcd95f8b3f63 /pkgs/tools/security | |
| parent | 863df54d1363f0377ca0f1410d5e1619ca47404c (diff) | |
| parent | 27a89ba43b0fb735ce867e8ab3d2442f8cc61dad (diff) | |
| download | nixpkgs-8d6fbd734139962d00ca730417a2532f77e150f2.tar nixpkgs-8d6fbd734139962d00ca730417a2532f77e150f2.tar.gz nixpkgs-8d6fbd734139962d00ca730417a2532f77e150f2.tar.bz2 nixpkgs-8d6fbd734139962d00ca730417a2532f77e150f2.tar.lz nixpkgs-8d6fbd734139962d00ca730417a2532f77e150f2.tar.xz nixpkgs-8d6fbd734139962d00ca730417a2532f77e150f2.tar.zst nixpkgs-8d6fbd734139962d00ca730417a2532f77e150f2.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/maigret/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/tools/security/tlsx/default.nix | 6 |
2 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/tools/security/maigret/default.nix b/pkgs/tools/security/maigret/default.nix index 05ea8dcf3df..0b9b3722501 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 = [ diff --git a/pkgs/tools/security/tlsx/default.nix b/pkgs/tools/security/tlsx/default.nix index 0d9925695a9..4f63061cac0 100644 --- a/pkgs/tools/security/tlsx/default.nix +++ b/pkgs/tools/security/tlsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tlsx"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-tyZDmtqQLTV06mLo1lg/qWRjvxvgVvGpoRXWX9HtXeo="; + hash = "sha256-TqYBLNnh4wjinoduFrmyNe+FgnGSCckwMy5zX0XhnlM="; }; - vendorSha256 = "sha256-ERZ4mWmtOsW1nYUshSbCzhy+KcujviPtL4LS/soPrFQ="; + vendorSha256 = "sha256-BppRtzTjiMcuc7xIz37bDcjnQHhOlstncES1vILTKYM="; meta = with lib; { description = "TLS grabber focused on TLS based data collection"; |