Unverified Commit 0058b2ab authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #268757 from fabaff/mitmproxy-macos-bump 

python311Packages.mitmproxy-macos: 0.3.11 -> 0.4.1, python311Packages.mitmproxy-rs: 0.3.11 -> 0.4.1
parents 9a7f1514 0c9c221a

pkgs/development/python-modules/mitmproxy-macos/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ 


buildPythonPackage rec {

  pname = "mitmproxy-macos";

  version = "0.3.11";

  version = "0.4.1";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "mitmproxy";

    repo = "mitmproxy_rs";

    rev = version;

    hash = "sha256-V6LUr1jJiTo0+53jipkTyzG5JSw6uHaS6ziyBaFbETw=";

    hash = "sha256-Vc7ez/W40CefO2ZLAHot14p478pDPtQor865675vCtI=";

  };



  sourceRoot = "${src.name}/mitmproxy-macos";

pkgs/development/python-modules/mitmproxy-rs/Cargo.lock

+66 −67
Original line number Diff line number Diff line
@@ -92,11 +92,33 @@ version = "0.7.4" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"



[[package]]

name = "async-stream"

version = "0.3.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"

dependencies = [

 "async-stream-impl",

 "futures-core",

 "pin-project-lite",

]



[[package]]

name = "async-stream-impl"

version = "0.3.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.37",

]



[[package]]

name = "async-trait"

version = "0.1.73"

version = "0.1.74"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"

checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"

dependencies = [

 "proc-macro2",

 "quote",
@@ -390,11 +412,12 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" 


[[package]]

name = "console-api"

version = "0.5.0"

version = "0.6.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e"

checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787"

dependencies = [

 "prost 0.11.9",

 "futures-core",

 "prost",

 "prost-types",

 "tonic",

 "tracing-core",
@@ -402,14 +425,14 @@ dependencies = [ 


[[package]]

name = "console-subscriber"

version = "0.1.10"

version = "0.2.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb"

checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e"

dependencies = [

 "console-api",

 "crossbeam-channel",

 "crossbeam-utils",

 "futures",

 "futures-task",

 "hdrhistogram",

 "humantime",

 "prost-types",
@@ -770,9 +793,9 @@ dependencies = [ 


[[package]]

name = "futures-channel"

version = "0.3.28"

version = "0.3.29"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"

checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"

dependencies = [

 "futures-core",

 "futures-sink",
@@ -780,9 +803,9 @@ dependencies = [ 


[[package]]

name = "futures-core"

version = "0.3.28"

version = "0.3.29"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"

checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"



[[package]]

name = "futures-executor"
@@ -797,15 +820,15 @@ dependencies = [ 


[[package]]

name = "futures-io"

version = "0.3.28"

version = "0.3.29"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"

checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"



[[package]]

name = "futures-macro"

version = "0.3.28"

version = "0.3.29"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"

checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"

dependencies = [

 "proc-macro2",

 "quote",
@@ -814,21 +837,21 @@ dependencies = [ 


[[package]]

name = "futures-sink"

version = "0.3.28"

version = "0.3.29"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"

checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"



[[package]]

name = "futures-task"

version = "0.3.28"

version = "0.3.29"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"

checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"



[[package]]

name = "futures-util"

version = "0.3.28"

version = "0.3.29"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"

checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"

dependencies = [

 "futures-channel",

 "futures-core",
@@ -1232,7 +1255,7 @@ checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd" 


[[package]]

name = "macos-certificate-truster"

version = "0.3.11"

version = "0.4.1"

dependencies = [

 "apple-security-framework",

]
@@ -1308,7 +1331,7 @@ dependencies = [ 


[[package]]

name = "mitm-wg-test-client"

version = "0.3.11"

version = "0.4.1"

dependencies = [

 "anyhow",

 "boringtun",
@@ -1319,7 +1342,7 @@ dependencies = [ 


[[package]]

name = "mitmproxy"

version = "0.3.11"

version = "0.4.1"

dependencies = [

 "anyhow",

 "apple-security-framework",
@@ -1334,7 +1357,7 @@ dependencies = [ 
 "nix 0.27.1",

 "once_cell",

 "pretty-hex",

 "prost 0.12.1",

 "prost",

 "rand",

 "rand_core",

 "smoltcp",
@@ -1346,7 +1369,7 @@ dependencies = [ 


[[package]]

name = "mitmproxy_rs"

version = "0.3.11"

version = "0.4.1"

dependencies = [

 "anyhow",

 "boringtun",
@@ -1628,16 +1651,6 @@ dependencies = [ 
 "unicode-ident",

]



[[package]]

name = "prost"

version = "0.11.9"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"

dependencies = [

 "bytes",

 "prost-derive 0.11.9",

]



[[package]]

name = "prost"

version = "0.12.1"
@@ -1645,20 +1658,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d"

dependencies = [

 "bytes",

 "prost-derive 0.12.1",

]



[[package]]

name = "prost-derive"

version = "0.11.9"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"

dependencies = [

 "anyhow",

 "itertools 0.10.5",

 "proc-macro2",

 "quote",

 "syn 1.0.109",

 "prost-derive",

]



[[package]]
@@ -1676,11 +1676,11 @@ dependencies = [ 


[[package]]

name = "prost-types"

version = "0.11.9"

version = "0.12.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"

checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf"

dependencies = [

 "prost 0.11.9",

 "prost",

]



[[package]]
@@ -1736,9 +1736,9 @@ dependencies = [ 


[[package]]

name = "pyo3-log"

version = "0.8.3"

version = "0.9.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f47b0777feb17f61eea78667d61103758b243a871edc09a7786500a50467b605"

checksum = "4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd"

dependencies = [

 "arc-swap",

 "log",
@@ -2205,9 +2205,9 @@ dependencies = [ 


[[package]]

name = "tokio"

version = "1.32.0"

version = "1.33.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"

checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"

dependencies = [

 "backtrace",

 "bytes",
@@ -2256,9 +2256,9 @@ dependencies = [ 


[[package]]

name = "tokio-util"

version = "0.7.9"

version = "0.7.10"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d"

checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"

dependencies = [

 "bytes",

 "futures-core",
@@ -2279,16 +2279,15 @@ dependencies = [ 


[[package]]

name = "tonic"

version = "0.9.2"

version = "0.10.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"

checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"

dependencies = [

 "async-stream",

 "async-trait",

 "axum",

 "base64 0.21.4",

 "bytes",

 "futures-core",

 "futures-util",

 "h2",

 "http",

 "http-body",
@@ -2296,7 +2295,7 @@ dependencies = [ 
 "hyper-timeout",

 "percent-encoding",

 "pin-project",

 "prost 0.11.9",

 "prost",

 "tokio",

 "tokio-stream",

 "tower",
@@ -2622,7 +2621,7 @@ dependencies = [ 


[[package]]

name = "windows-redirector"

version = "0.3.11"

version = "0.4.1"

dependencies = [

 "anyhow",

 "env_logger",
@@ -2631,7 +2630,7 @@ dependencies = [ 
 "log",

 "lru_time_cache",

 "mitmproxy",

 "prost 0.12.1",

 "prost",

 "tokio",

 "windivert",

 "winres",

pkgs/development/python-modules/mitmproxy-rs/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@ 


buildPythonPackage rec {

  pname = "mitmproxy-rs";

  version = "0.3.11";

  version = "0.4.1";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "mitmproxy";

    repo = "mitmproxy_rs";

    rev = version;

    hash = "sha256-V6LUr1jJiTo0+53jipkTyzG5JSw6uHaS6ziyBaFbETw=";

    hash = "sha256-Vc7ez/W40CefO2ZLAHot14p478pDPtQor865675vCtI=";

  };



  cargoDeps = rustPlatform.importCargoLock {

pkgs/development/python-modules/mitmproxy/default.nix

+11 −7
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, buildPythonPackage

, pythonOlder

, stdenv

  # Mitmproxy requirements

, aioquic

, asgiref
@@ -44,19 +44,19 @@ 


buildPythonPackage rec {

  pname = "mitmproxy";

  version = "10.1.1";

  disabled = pythonOlder "3.9";

  version = "10.1.5";

  pyproject = true;



  disabled = pythonOlder "3.9";



  src = fetchFromGitHub {

    owner = "mitmproxy";

    repo = "mitmproxy";

    rev = "refs/tags/${version}";

    hash = "sha256-/ouMj7UVowvzwjOuusgVfXjvjNPKpuJUuoJf6Sl9P44=";

    hash = "sha256-WtZ5KPkTjYMCjrghVcihxuQ2cS88OOCbMYHfqzeo4qQ=";

  };



  propagatedBuildInputs = [

    setuptools

    aioquic

    asgiref

    blinker
@@ -73,11 +73,12 @@ buildPythonPackage rec { 
    msgpack

    passlib

    protobuf

    pyopenssl

    publicsuffix2

    pyopenssl

    pyparsing

    pyperclip

    ruamel-yaml

    setuptools

    sortedcontainers

    tornado

    urwid
@@ -113,10 +114,12 @@ buildPythonPackage rec { 
    "test_flowview"

    # ValueError: Exceeds the limit (4300) for integer string conversion

    "test_roundtrip_big_integer"



    "test_wireguard"

    "test_commands_exist"

    "test_statusbar"

    # AssertionError: Playbook mismatch!

    "test_untrusted_cert"

    "test_mitmproxy_ca_is_untrusted"

  ];



  disabledTestPaths = [
@@ -131,6 +134,7 @@ buildPythonPackage rec { 
  meta = with lib; {

    description = "Man-in-the-middle proxy";

    homepage = "https://mitmproxy.org/";

    changelog = "https://github.com/mitmproxy/mitmproxy/blob/${version}/CHANGELOG.md";

    license = licenses.mit;

    maintainers = with maintainers; [ kamilchm SuperSandro2000 ];

  };