diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2019-03-17 00:12:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-17 00:12:38 +0100 |
| commit | 88ffb73636a497737e94e023d421fb05b8db3a43 (patch) | |
| tree | 84492f9255c3cbc9f247f12dfddce2e892dbd478 /pkgs/tools/networking | |
| parent | 0d88ab89dcbe05203c77bbf1d5b0e6c20de69824 (diff) | |
| parent | e1e5df688a60dcb6736a367619749e428178dded (diff) | |
| download | nixlib-88ffb73636a497737e94e023d421fb05b8db3a43.tar nixlib-88ffb73636a497737e94e023d421fb05b8db3a43.tar.gz nixlib-88ffb73636a497737e94e023d421fb05b8db3a43.tar.bz2 nixlib-88ffb73636a497737e94e023d421fb05b8db3a43.tar.lz nixlib-88ffb73636a497737e94e023d421fb05b8db3a43.tar.xz nixlib-88ffb73636a497737e94e023d421fb05b8db3a43.tar.zst nixlib-88ffb73636a497737e94e023d421fb05b8db3a43.zip | |
Merge pull request #57411 from srhb/mitmproxy-wsproto-update
mitmproxy: wsproto and pytest fixes
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/mitmproxy/default.nix | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index d06399169707..ee331648e75f 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -22,6 +22,26 @@ buildPythonPackage rec { url = "https://github.com/mitmproxy/mitmproxy/commit/1b6a8d6acd3d70f9b9627ad4ae9def08103f8250.patch"; sha256 = "03y79c25yir7d8xj79czdc81y3irqq1i3ks9ca0mv1az8b7xsvfv"; }) + (fetchpatch { + # 0.13 <= wsproto < 0.14 patch + # https://github.com/mitmproxy/mitmproxy/issues/3459 + # TODO: remove on next update + name = "wsproto-0.13.patch"; + url = https://github.com/mitmproxy/mitmproxy/commit/70777a1b6ed64af9cafcdef223a8a260ecc96864.patch; + sha256 = "1ddxdr7js510kzyq3gyks4k5k1n8zb1i9amxw7wzmi1dcg8kqw9a"; + # We strip these bounds anyway + excludes = [ "setup.py" ]; + }) + (fetchpatch { + # Fix for newer pytest disallowing calling fixtures + # https://github.com/mitmproxy/mitmproxy/issues/3403 + # TODO: remove on next update + name = "dont-call-fixtures.patch"; + url = https://github.com/mitmproxy/mitmproxy/commit/ce28721458c8cc71de86513a5110676e9763041b.patch; + sha256 = "05pljr28lx7l1xgswqr9sz8dnhvc7npzh8xg2p9hignf159kd54d"; + # Irrelevant in nixpkgs + excludes = [ "setup.py" "setup.cfg" "release/docker/*" ]; + }) ]; postPatch = '' |