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.

Sign up for GitHub

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: 4.0.4 -> 5.1.1 #85458

Merged
merged 2 commits into from Apr 19, 2020
Merged

mitmproxy: 4.0.4 -> 5.1.1 #85458

merged 2 commits into from Apr 19, 2020

Conversation

rnhmjoj
Copy link
Contributor

@rnhmjoj rnhmjoj commented Apr 17, 2020 •
edited

Motivation for this change

Version bump. I intended to port this to 20.03 but the cryptography update is problematic.

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
  • Tested execution of all binary files (mitmproxy works)
  • 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.

cc @orivej

@ofborg ofborg bot requested review from fpletz, kamilchm and primeos April 17, 2020 20:50
@rnhmjoj rnhmjoj mentioned this pull request Apr 17, 2020
Closed
@primeos
Copy link
Member

primeos commented Apr 17, 2020

Quick heads up that the cryptography update is already in staging: #84192

@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Apr 18, 2020

Ah, thank you. Should I move this to staging?

@primeos
Copy link
Member

primeos commented Apr 18, 2020 •
edited

@rnhmjoj I think that would be a good/easy solution for this case (alternatively wait until #84442 is merged - but that might take a few days).

(Edit: Or in theory this might be fine to merge into staging-next as it's a leaf package and therefore shouldn't destabilize staging-next, but I assume we usually want to merge fixes only into that branch.)

@rnhmjoj rnhmjoj changed the base branch from master to staging April 18, 2020 15:03
@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Apr 18, 2020

@primeos Ok, done!

@ofborg ofborg bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: haskell 6.topic: nixos 6.topic: stdenv Standard environment 8.has: documentation 8.has: module (update) and removed 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang labels Apr 18, 2020
@vcunat
Copy link
Member

vcunat commented Apr 18, 2020

That iteration of staging-next is in master now.

@rnhmjoj rnhmjoj changed the base branch from staging to master April 19, 2020 09:24
@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Apr 19, 2020

Moved back to master. I tested mitmproxy again and it still works.

@rnhmjoj rnhmjoj merged commit d4d6d26 into NixOS:master Apr 19, 2020
@arcz arcz mentioned this pull request Apr 19, 2020
Closed
10 tasks
@rnhmjoj rnhmjoj deleted the mitmproxy branch June 19, 2020 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@fpletz fpletz Awaiting requested review from fpletz

@kamilchm kamilchm Awaiting requested review from kamilchm

@primeos primeos Awaiting requested review from primeos

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@rnhmjoj @primeos @vcunat