Merge pull request #281297 from SuperSandro2000/mitmproxy-fix

authored by Sandro and committed by GitHub fc75ae71 f6e0a889

+18 -74
-56
pkgs/development/python-modules/aioquic-mitmproxy/default.nix
··· 1 - { lib 2 - , buildPythonPackage 3 - , certifi 4 - , cryptography 5 - , fetchFromGitHub 6 - , pylsqpack 7 - , pyopenssl 8 - , pytestCheckHook 9 - , pythonOlder 10 - , service-identity 11 - , setuptools 12 - , wheel 13 - }: 14 - 15 - buildPythonPackage rec { 16 - pname = "aioquic-mitmproxy"; 17 - version = "0.9.21.1"; 18 - pyproject = true; 19 - 20 - disabled = pythonOlder "3.8"; 21 - 22 - src = fetchFromGitHub { 23 - owner = "meitinger"; 24 - repo = "aioquic_mitmproxy"; 25 - rev = "refs/tags/${version}"; 26 - hash = "sha256-eD3eICE9jS1jyqMgWwcv6w3gkR0EyGcKwgSXhasXNeA="; 27 - }; 28 - 29 - nativeBuildInputs = [ 30 - setuptools 31 - wheel 32 - ]; 33 - 34 - propagatedBuildInputs = [ 35 - certifi 36 - cryptography 37 - pylsqpack 38 - pyopenssl 39 - service-identity 40 - ]; 41 - 42 - nativeCheckInputs = [ 43 - pytestCheckHook 44 - ]; 45 - 46 - pythonImportsCheck = [ 47 - "aioquic" 48 - ]; 49 - 50 - meta = with lib; { 51 - description = "QUIC and HTTP/3 implementation in Python"; 52 - homepage = "https://github.com/meitinger/aioquic_mitmproxy"; 53 - license = licenses.bsd3; 54 - maintainers = with maintainers; [ fab ]; 55 - }; 56 - }
···
+17 -16
pkgs/development/python-modules/mitmproxy/default.nix
··· 3 , fetchFromGitHub 4 , buildPythonPackage 5 , pythonOlder 6 # Mitmproxy requirements 7 - , aioquic-mitmproxy 8 , asgiref 9 , blinker 10 , brotli ··· 56 hash = "sha256-BO7oQ4TVuZ4dCtROq2M24V6HVo0jzyBdQfb67dYA07U="; 57 }; 58 59 propagatedBuildInputs = [ 60 - aioquic-mitmproxy 61 asgiref 62 blinker 63 brotli ··· 109 "test_get_version" 110 # https://github.com/mitmproxy/mitmproxy/commit/36ebf11916704b3cdaf4be840eaafa66a115ac03 111 # Tests require terminal 112 - "test_integration" 113 "test_contentview_flowview" 114 "test_flowview" 115 - # ValueError: Exceeds the limit (4300) for integer string conversion 116 - "test_roundtrip_big_integer" 117 "test_wireguard" 118 - "test_commands_exist" 119 - "test_statusbar" 120 - # AssertionError: Playbook mismatch! 121 - "test_untrusted_cert" 122 - "test_mitmproxy_ca_is_untrusted" 123 - ]; 124 - 125 - disabledTestPaths = [ 126 - # teardown of half the tests broken 127 - "test/mitmproxy/addons/test_onboarding.py" 128 ]; 129 130 dontUsePytestXdist = true; ··· 136 homepage = "https://mitmproxy.org/"; 137 changelog = "https://github.com/mitmproxy/mitmproxy/blob/${version}/CHANGELOG.md"; 138 license = licenses.mit; 139 - maintainers = with maintainers; [ kamilchm SuperSandro2000 ]; 140 }; 141 }
··· 3 , fetchFromGitHub 4 , buildPythonPackage 5 , pythonOlder 6 + , pythonRelaxDepsHook 7 # Mitmproxy requirements 8 + , aioquic 9 , asgiref 10 , blinker 11 , brotli ··· 57 hash = "sha256-BO7oQ4TVuZ4dCtROq2M24V6HVo0jzyBdQfb67dYA07U="; 58 }; 59 60 + nativeBuildInputs = [ 61 + pythonRelaxDepsHook 62 + ]; 63 + 64 + pythonRelaxDeps = [ 65 + "aioquic" 66 + ]; 67 + 68 propagatedBuildInputs = [ 69 + aioquic 70 asgiref 71 blinker 72 brotli ··· 118 "test_get_version" 119 # https://github.com/mitmproxy/mitmproxy/commit/36ebf11916704b3cdaf4be840eaafa66a115ac03 120 # Tests require terminal 121 + "test_commands_exist" 122 "test_contentview_flowview" 123 "test_flowview" 124 + "test_integration" 125 + "test_statusbar" 126 + # FileNotFoundError: [Errno 2] No such file or directory 127 + # likely wireguard is also not working in the sandbox 128 "test_wireguard" 129 ]; 130 131 dontUsePytestXdist = true; ··· 137 homepage = "https://mitmproxy.org/"; 138 changelog = "https://github.com/mitmproxy/mitmproxy/blob/${version}/CHANGELOG.md"; 139 license = licenses.mit; 140 + maintainers = with maintainers; [ SuperSandro2000 ]; 141 }; 142 }
+1
pkgs/top-level/python-aliases.nix
··· 39 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 40 aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27 41 aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05 42 amazon_kclpy = amazon-kclpy; # added 2023-08-08 43 ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30 44 ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute"; # Added 2023-05-16
··· 39 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 40 aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27 41 aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05 42 + aioquic-mitmproxy = throw "aioquic-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-01-16 43 amazon_kclpy = amazon-kclpy; # added 2023-08-08 44 ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30 45 ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute"; # Added 2023-05-16
-2
pkgs/top-level/python-packages.nix
··· 349 350 aioquic = callPackage ../development/python-modules/aioquic { }; 351 352 - aioquic-mitmproxy = callPackage ../development/python-modules/aioquic-mitmproxy { }; 353 - 354 aiorecollect = callPackage ../development/python-modules/aiorecollect { }; 355 356 aioredis = callPackage ../development/python-modules/aioredis { };
··· 349 350 aioquic = callPackage ../development/python-modules/aioquic { }; 351 352 aiorecollect = callPackage ../development/python-modules/aiorecollect { }; 353 354 aioredis = callPackage ../development/python-modules/aioredis { };