From 2e08e8cb2602b87b367320cdc26391be13e8c5d5 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 17 Apr 2020 23:01:38 +0200 Subject: [PATCH] mitmproxy: fix build ZHF: #80379 --- pkgs/tools/networking/mitmproxy/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index 79f0058e9d6d3..f252b51e18dba 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { # 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; + url = "https://github.com/mitmproxy/mitmproxy/commit/70777a1b6ed64af9cafcdef223a8a260ecc96864.patch"; sha256 = "1ddxdr7js510kzyq3gyks4k5k1n8zb1i9amxw7wzmi1dcg8kqw9a"; # We strip these bounds anyway excludes = [ "setup.py" ]; @@ -37,11 +37,19 @@ buildPythonPackage rec { # 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; + url = "https://github.com/mitmproxy/mitmproxy/commit/ce28721458c8cc71de86513a5110676e9763041b.patch"; sha256 = "05pljr28lx7l1xgswqr9sz8dnhvc7npzh8xg2p9hignf159kd54d"; # Irrelevant in nixpkgs excludes = [ "setup.py" "setup.cfg" "release/docker/*" ]; }) + (fetchpatch { + # Fix for OpenSSL 1.1.1f + # https://github.com/mitmproxy/mitmproxy/pull/3692#issuecomment-608454530 + # TODO: remove on next update + name = "temporarily-fix-key-logging.patch"; + url = "https://github.com/mitmproxy/mitmproxy/commit/4bfb81c0089d0e0c1c24739f01fca41a3f055f3a.diff"; + sha256 = "18yd6alalzq08biikc4aywhvfslz55fpxhixs9id1zzaf6c0vr45"; + }) ./pytest5.patch ]; @@ -79,6 +87,5 @@ buildPythonPackage rec { homepage = https://mitmproxy.org/; license = licenses.mit; maintainers = with maintainers; [ fpletz kamilchm ]; - broken = true; }; }