mitmproxy: 9.0.1 -> 10.1.1 #264207
Merged
mitmproxy: 9.0.1 -> 10.1.1 #264207
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also add the new mitmproxy-rs dependency, which seemingly replaces mitmproxy-wireguard.
|
Result of 12 packages built:
|
|
I see an issue. ...ew/pr-264207-1]$ ./results/mitmproxy/bin/mitmproxy
Traceback (most recent call last):
File "/nix/store/lhi8cp78nipwmirpmng0xj2ac3hbllch-python3.11-mitmproxy-10.1.1/bin/.mitmproxy-wrapped", line 6, in <module>
from mitmproxy.tools.main import mitmproxy
File "/nix/store/sf9g8ylrdzzgpkdk8bmzb7qynfpg1wa3-python3.10-mitmproxy-10.1.1/lib/python3.10/site-packages/mitmproxy/tools/main.py", line 15, in <module>
from mitmproxy import master
File "/nix/store/sf9g8ylrdzzgpkdk8bmzb7qynfpg1wa3-python3.10-mitmproxy-10.1.1/lib/python3.10/site-packages/mitmproxy/master.py", line 8, in <module>
from mitmproxy import eventsequence
File "/nix/store/sf9g8ylrdzzgpkdk8bmzb7qynfpg1wa3-python3.10-mitmproxy-10.1.1/lib/python3.10/site-packages/mitmproxy/eventsequence.py", line 8, in <module>
from mitmproxy import http
File "/nix/store/sf9g8ylrdzzgpkdk8bmzb7qynfpg1wa3-python3.10-mitmproxy-10.1.1/lib/python3.10/site-packages/mitmproxy/http.py", line 24, in <module>
from mitmproxy.net import encoding
File "/nix/store/sf9g8ylrdzzgpkdk8bmzb7qynfpg1wa3-python3.10-mitmproxy-10.1.1/lib/python3.10/site-packages/mitmproxy/net/encoding.py", line 12, in <module>
import zstandard as zstd
File "/nix/store/bsiv3nsbg8p70pz20gnydqbjf8w4gj6n-python3.10-zstandard-0.21.0/lib/python3.10/site-packages/zstandard/__init__.py", line 39, in <module>
from .backend_c import * # type: ignore
^^^^^^^^^^^^^^^^^^^^^^^^
ModuleNotFoundError: No module named 'zstandard.backend_c' |
|
Pretty sure this is nixpkgs-review messing with the PYTHONPATH. I wonder if we should just make |
|
I'm just going to merge this before it bitrots. |
| }: | ||
|
|
||
| buildPythonPackage rec { | ||
| pname = "mitmproxy-rs"; |
There was a problem hiding this comment.
If we go really strongly by the contributing guide then this should have been it's own commit but it's alright for me if I am honest :)
| changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md"; | ||
| license = licenses.mit; | ||
| maintainers = with maintainers; [ fab ]; | ||
| platforms = platforms.all; |
There was a problem hiding this comment.
We default to unix here by buildPythonPackage which is more correct than all
| @@ -6856,6 +6856,8 @@ self: super: with self; { | |||
|
|
|||
| mitmproxy = callPackage ../development/python-modules/mitmproxy { }; | |||
|
|
|||
| mitmproxy-rs = callPackage ../development/python-modules/mitmproxy-rs { }; | |||
|
|
|||
| mitmproxy-wireguard = callPackage ../development/python-modules/mitmproxy-wireguard { }; | |||
There was a problem hiding this comment.
Dropping that in another PR. To quote the PR:
https://github.com/mitmproxy/mitmproxy/pull/5909
mitmproxy-wireguard is already shipping in 9.0, but we will add more non-WireGuard stuff written in Rust.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also add the new mitmproxy-rs dependency, which seemingly replaces mitmproxy-wireguard.
Description of changes
Got nerdsniped into it on Matrix. @fabaff I hope you don't mind being listed as maintainer for the Rust bits.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)