about summary refs log tree commit diff
path: root/pkgs/tools/networking/mitmproxy
diff options
context:
space:
mode:
authorSarah Brofeldt <sbrofeldt@gmail.com>2019-03-11 17:08:24 +0100
committerSarah Brofeldt <sbrofeldt@gmail.com>2019-03-11 17:08:24 +0100
commite1e5df688a60dcb6736a367619749e428178dded (patch)
tree840ae8973b64f01bc2fd0b9644ea173bfb53854b /pkgs/tools/networking/mitmproxy
parent3df55b80bbd68f66168913e519a3506b1b32e588 (diff)
downloadnixlib-e1e5df688a60dcb6736a367619749e428178dded.tar
nixlib-e1e5df688a60dcb6736a367619749e428178dded.tar.gz
nixlib-e1e5df688a60dcb6736a367619749e428178dded.tar.bz2
nixlib-e1e5df688a60dcb6736a367619749e428178dded.tar.lz
nixlib-e1e5df688a60dcb6736a367619749e428178dded.tar.xz
nixlib-e1e5df688a60dcb6736a367619749e428178dded.tar.zst
nixlib-e1e5df688a60dcb6736a367619749e428178dded.zip
mitmproxy: Fix tests with pytest >= 4.x
Diffstat (limited to 'pkgs/tools/networking/mitmproxy')
-rw-r--r--pkgs/tools/networking/mitmproxy/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index 97d5d5129edb..ee331648e75f 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 = ''