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

aiohttp: move idna-ssl into propogatedBuildInputs #51010

Closed
wants to merge 1 commit into from

Conversation

WhittlesJr
Copy link
Contributor

Motivation for this change

Fixes #51009

I have no idea what the side effects may be of this change, but it does seem to solve the issue. If I need to do more testing, or my commit format is not correct, please let me know.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ]
++ lib.optional (pythonOlder "3.7") idna-ssl;
propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl idna-ssl ];
#++ lib.optional (pythonOlder "3.7") idna-ssl;
Copy link
Contributor

Choose a reason for hiding this comment

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

This line correspond to aiohttp 3.4.4 setup.py idna-ssl>=1.0; python_version<"3.7".

appdaemon is failing because depend on aiohttp 2.3.10 which has idna-ssl>=1.0.0. I'm inclined to fix it in appdaemon expression

diff --git i/pkgs/servers/home-assistant/appdaemon.nix w/pkgs/servers/home-assistant/appdaemon.nix
index b3df4a481cd..8f865f11db6 100644
--- i/pkgs/servers/home-assistant/appdaemon.nix
+++ w/pkgs/servers/home-assistant/appdaemon.nix
@@ -10,6 +10,7 @@ let
           inherit version;
           sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
         };
+        propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.idna-ssl ];
       });
 
       yarl = super.yarl.overridePythonAttrs (oldAttrs: rec {

Copy link
Member

Choose a reason for hiding this comment

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

Yes, let's do that instead.

@dotlambda
Copy link
Member

See https://github.com/aio-libs/aiohttp/blob/0c54bef942a076ba4bee5b66e9ba5ba33b7a6176/setup.py#L94 for why it was included for Python<3.7 only.
I can build aiohttp just fine without so I don't get what the problem is.

@dotlambda dotlambda closed this in 5a2317d Nov 25, 2018
@WhittlesJr
Copy link
Contributor Author

@dotlambda Thank you for fixing this!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants