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

python3Packages.aiohttp: 2.3.10 -> 3.0.1 #34891

Merged
merged 1 commit into from Feb 16, 2018
Merged

python3Packages.aiohttp: 2.3.10 -> 3.0.1 #34891

merged 1 commit into from Feb 16, 2018

Conversation

dotlambda
Copy link
Member

Judging from nox-review, it seems like gns3 needs to pin the aiohttp version.
/cc @primeos

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@dotlambda
Copy link
Member Author

It's probably best to wait until 43795b2 has landed in master, in order to prevent merge conflicts.

primeos added a commit that referenced this pull request Feb 16, 2018
@primeos
gns3Packages.server{Stable,Preview}: Pin the aiohttp version
76723a2 
This is required for #34891.
primeos
primeos requested changes Feb 16, 2018
View reviewed changes
Copy link
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

Can you rebase onto master before we merge this? Should be a bit simpler to read the log then (as 43795b2 already includes some of these changes).

I've pinned the aiohttp version for gns3 so it should be ready to merge, thanks for the heads-up 😄.

pkgs/development/python-modules/aiohttp/default.nix Outdated
@@ -1,38 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
Copy link
Member

Choose a reason for hiding this comment

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

Can you drop this?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, I can. That's left over from 3.0.0.

@dotlambda
Copy link
Member Author

Rebased on master. Thanks for fixing gns3, @primeos.
I also checked nox-review and nothing seems to break.

primeos
primeos approved these changes Feb 16, 2018
View reviewed changes
Copy link
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

Awesome, thanks!

@primeos primeos merged commit b2f39f9 into NixOS:master Feb 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@primeos primeos primeos approved these changes

@FRidh FRidh Awaiting requested review from FRidh

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.

None yet
3 participants
@dotlambda @primeos @GrahamcOfBorg