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

python310Packages.twisted: remove pyOpenSSL checkInput on aarch64-darwin #180234

Conversation

andrew-d
Copy link
Contributor

@andrew-d andrew-d commented Jul 5, 2022

Description of changes

This unbreaks twisted, and also programs like bup and transitively git-annex on aarch64-darwin. An alternative to #179924.

Closes #179924

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jul 5, 2022
@jiegec
Copy link
Contributor

jiegec commented Jul 5, 2022

I am in favor of this way to handle the pyopenssl issue. The same could be done to urllib3 as well:

  propagatedBuildInputs = passthru.optional-dependencies.brotli
    ++ passthru.optional-dependencies.secure;
  passthru.optional-dependencies = {
    brotli = if isPyPy then [ brotlicffi ] else [ brotli ];
    secure = [ certifi cryptography idna pyopenssl ];
    socks = [ pysocks ];
  };

@SuperSandro2000
Copy link
Member

We need to target at least staging-next here because we need more fixes from there.

@SuperSandro2000
Copy link
Member

I am in favor of this way to handle the pyopenssl issue. The same could be done to urllib3 as well:

That got already fixed in staging-next (or maybe still staging)

@andrew-d andrew-d changed the base branch from master to staging-next July 7, 2022 15:29
@andrew-d andrew-d force-pushed the andrew/twisted-pyopenssl-aarch64-darwin branch from d5cbaf0 to ddcb3f9 Compare July 7, 2022 15:30
@andrew-d
Copy link
Contributor Author

andrew-d commented Jul 7, 2022

@SuperSandro2000 - Rebased on staging-next and changed the base branch 👍

@SuperSandro2000 SuperSandro2000 changed the title twisted: remove pyOpenSSL checkInput on aarch64-darwin python310Packages.twisted: remove pyOpenSSL checkInput on aarch64-darwin Jul 7, 2022
@SuperSandro2000
Copy link
Member

@ofborg build python310Packages.twisted

@SuperSandro2000 SuperSandro2000 merged commit ccf89af into NixOS:staging-next Jul 7, 2022
@andrew-d andrew-d deleted the andrew/twisted-pyopenssl-aarch64-darwin branch July 7, 2022 21:26
@andrew-d
Copy link
Contributor Author

andrew-d commented Jul 7, 2022

@SuperSandro2000 - Thank you for the assistance here!

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.

3 participants