Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mitmproxy: 5.2 -> 5.3.0 #104110

Merged
merged 1 commit into from Nov 20, 2020
Merged

mitmproxy: 5.2 -> 5.3.0 #104110

merged 1 commit into from Nov 20, 2020

Conversation

divanorama
Copy link
Contributor

@divanorama divanorama commented Nov 18, 2020 •
edited

Resolves #103992 where test phase was failing due to
openssl 1.1.1g -> 1.1.1h causing test certificate rejection.
Which was fixed in 5.3.0 release.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested review from kamilchm and fpletz November 18, 2020 00:13
jonringer
jonringer reviewed Nov 18, 2020
View reviewed changes
pkgs/development/python-modules/mitmproxy/default.nix Outdated
Comment on lines 56 to 57
patches = [
# Apply patch from upstream to make mitmproxy v5.2 compatible with urwid >v2.1.0
(fetchpatch {
name = "urwid-lt-2.1.0.patch";
url = "https://github.com/mitmproxy/mitmproxy/commit/ea9177217208fdf642ffc54f6b1f6507a199350c.patch";
sha256 = "1z5r8izg5nvay01ywl3xc6in1vjfi9f144j057p3k5rzfliv49gg";
})
];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you mind removing the entire patches attr

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure 👍

@jonringer
Copy link
Contributor

otherwise LGTM

https://github.com/NixOS/nixpkgs/pull/104110
2 packages built:
mitmproxy python37Packages.mitmproxy

jonringer
jonringer reviewed Nov 20, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please follow CONTRIBUTING.md and manual#submitting-changes-making-patches and squash the fix-up commits.

git rebase -i is a powerful command which achieves this, I created a small video demonstrating it's use here. A more indepth text tutorial can be found here

@divanorama
mitmproxy: 5.2 -> 5.3.0
fbf5035 
Resolves NixOS#103992 where test phase was failing due to
openssl 1.1.1g -> 1.1.1h causing test certificate rejection.
Which was fixed in 5.3.0 release.
jonringer
jonringer approved these changes Nov 20, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Result of nixpkgs-review pr 104110 1

2 packages built:
  • mitmproxy (python38Packages.mitmproxy)
  • python37Packages.mitmproxy

@jonringer jonringer merged commit fccb704 into NixOS:master Nov 20, 2020
@Ma27
Copy link
Member

Ma27 commented Dec 19, 2020

Why was #103992 closed when this was only merged to master? Just got bitten by this and updated the package on 20.09 in 7d57790.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@kamilchm kamilchm Awaiting requested review from kamilchm

@fpletz fpletz Awaiting requested review from fpletz

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

mitmproxy uninstallable in NixOS 20.09
3 participants
@divanorama @jonringer @Ma27