Merge pull request #35514 from rnhmjoj/mitm

Fix mitmproxy

pkgs/tools/networking/mitmproxy/default.nix

@@ -1,60 +1,47 @@
-{ stdenv, fetchpatch, fetchFromGitHub, fetchurl, python3, glibcLocales }:
+{ stdenv, fetchFromGitHub, python3Packages, glibcLocales }:
 
-let
-  # When overrides are not needed, then only remove the contents of this set.
-  packageOverrides = self: super: {
-    ldap3 = super.ldap3.overridePythonAttrs (oldAttrs: rec {
-      version = "2.3";
-      src = oldAttrs.src.override {
-        inherit version;
-        sha256 = "c056b3756076e15aa71c963c7c5a44d5d9bbd430263ee49598d4454223a766ac";
-      };
-    });
-    pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec {
-      version = "0.3.7";
-      src = oldAttrs.src.override {
-        inherit version;
-        sha256 = "187f2a66d617683f8e82d5c00033b7c8a0287e1da88a9d577aebec321cad4965";
-      };
-    });
-  };
-
-  pythonPackages = (python3.override {inherit packageOverrides; }).pkgs;
-in with pythonPackages;
+with python3Packages;
 
 buildPythonPackage rec {
-  baseName = "mitmproxy";
-  name = "${baseName}-unstable-2017-10-31";
+  pname = "mitmproxy";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
-    owner = baseName;
-    repo = baseName;
-    rev = "80a8eaa708ea31dd9c5e7e1ab6b02c69079039c0";
+    owner  = pname;
+    repo   = pname;
+    rev    = "v${version}";
     sha256 = "0rvwm11yryzlp3c1i42rk2iv1m38yn6r83k41jb51hwg6wzbwzvw";
   };
 
+  postPatch = ''
+    # remove dependency constraints
+    sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py
+  '';
+
   checkPhase = ''
     export HOME=$(mktemp -d)
+    export LC_CTYPE=en_US.UTF-8
     # test_echo resolves hostnames
-    LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo and not test_find_unclaimed_URLs '
+    pytest -k 'not test_echo and not test_find_unclaimed_URLs '
   '';
 
   propagatedBuildInputs = [
     blinker click certifi cryptography
-    h2 hyperframe
-    kaitaistruct passlib pyasn1 pyopenssl
-    pyparsing pyperclip requests ruamel_yaml tornado
-    urwid brotlipy sortedcontainers ldap3
+    h2 hyperframe kaitaistruct passlib
+    pyasn1 pyopenssl pyparsing pyperclip
+    requests ruamel_yaml tornado urwid
+    brotlipy sortedcontainers ldap3
   ];
 
   buildInputs = [
-    beautifulsoup4 flask pytest pytestrunner glibcLocales
+    beautifulsoup4 flask pytest
+    pytestrunner glibcLocales
   ];
 
   meta = with stdenv.lib; {
     description = "Man-in-the-middle proxy";
-    homepage = https://mitmproxy.org/;
-    license = licenses.mit;
+    homepage    = https://mitmproxy.org/;
+    license     = licenses.mit;
     maintainers = with maintainers; [ fpletz kamilchm ];
   };
 }

pkgs/tools/networking/mitmproxy/tornado-4.6.patch

@@ -1,11 +0,0 @@
---- mitmproxy-v2.0.2-src.org/setup.py	2017-08-28 07:31:51.727424688 +0100
-+++ mitmproxy-v2.0.2-src/setup.py	2017-08-28 07:35:55.608919302 +0100
-@@ -78,7 +78,7 @@
-         "pyperclip>=1.5.22, <1.6",
-         "requests>=2.9.1, <3",
-         "ruamel.yaml>=0.13.2, <0.14",
--        "tornado>=4.3, <4.5",
-+        "tornado>=4.3, <4.6",
-         "urwid>=1.3.1, <1.4",
-         "watchdog>=0.8.3, <0.9",
-         "brotlipy>=0.5.1, <0.7",