From 3df55b80bbd68f66168913e519a3506b1b32e588 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Mon, 11 Mar 2019 17:08:02 +0100
Subject: [PATCH 1/2] mitmproxy: Fix build with wsproto >= 0.13

---
 pkgs/tools/networking/mitmproxy/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index d0639916970..97d5d5129ed 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -22,6 +22,16 @@ 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" ];
+    })
   ];
 
   postPatch = ''

From e1e5df688a60dcb6736a367619749e428178dded Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Mon, 11 Mar 2019 17:08:24 +0100
Subject: [PATCH 2/2] mitmproxy: Fix tests with pytest >= 4.x

---
 pkgs/tools/networking/mitmproxy/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index 97d5d5129ed..ee331648e75 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -32,6 +32,16 @@ buildPythonPackage rec {
       # 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 = ''