Skip to content

python3Packages.aiohttp: remove trustme test dependency#173809

Merged
dotlambda merged 1 commit intoNixOS:masterfrom
kwohlfahrt:remove-pyopenssl
May 25, 2022
Merged

python3Packages.aiohttp: remove trustme test dependency#173809
dotlambda merged 1 commit intoNixOS:masterfrom
kwohlfahrt:remove-pyopenssl

Conversation

@kwohlfahrt
Copy link
Contributor

@kwohlfahrt kwohlfahrt commented May 20, 2022

This dependency is no longer needed, and makes the package unbuildable
on aarch64-darwin, as it transitively depends on pyopenssl, which is
marked broken on this platform (see #172397).

This should fix a number of common Python packages on aarch64-darwin
(e.g. ansible).

  • 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.05 Release Notes (or backporting 21.11 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.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label May 20, 2022
@ofborg ofborg bot requested a review from dotlambda May 20, 2022 22:22
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels May 20, 2022
@kwohlfahrt kwohlfahrt mentioned this pull request May 20, 2022
Merged
13 tasks
dotlambda
dotlambda reviewed May 20, 2022
View reviewed changes
@dotlambda dotlambda requested a review from mweinelt May 20, 2022 23:09
@ofborg ofborg bot requested a review from dotlambda May 21, 2022 09:23
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels May 21, 2022
ELD added a commit to ELD/nix-system that referenced this pull request May 21, 2022
@ELD
Patch python and neovim deps
2eb9691 
`pyopenssl` is broken on Apple Silicon and [this PR marks it as
broken](NixOS/nixpkgs#172397) (which I think is
a little overzealous).
[This other pending PR fixes the issue](NixOS/nixpkgs#173809)
by making `trustme` an optional dependency for `aiohttp`. While the PR
is pending, I've added an overlay to accomplish the same thing — and
mark `pyopenssl` as _not_ broken, for now.

Additionally, Neovim broke in recent versions of home-manager, for some
reason. There's a workaround available [here](nix-community/home-manager#2966 (comment))
and the home-manager maintainers worked quickly to merge a fix in.

This unblocks updating all flake dependencies and gets the system config
back into working order.
ELD added a commit to ELD/nix-system that referenced this pull request May 21, 2022
@ELD
Update Flake Inputs (#34)
20a9227 
* flake.lock: Update

Flake lock file updates:

• Updated input 'darwin':
    'github:kclejeune/nix-darwin/fff582f3244f31e7455d0c5d93f2e3aa7554da90' (2022-04-20)
  → 'github:kclejeune/nix-darwin/c9c32574428a3182dcb2bd24ef6c73c974c368ae' (2022-05-20)
• Updated input 'devshell':
    'github:numtide/devshell/d97df53b5ddaa1cfbea7cddbd207eb2634304733' (2022-04-25)
  → 'github:numtide/devshell/a5327cd01e58d2848c73062f2661278ad615748f' (2022-05-19)
• Updated input 'flake-utils':
    'github:numtide/flake-utils/a4b154ebbdc88c8498a5c7b01589addc9e9cb678' (2022-04-11)
  → 'github:numtide/flake-utils/04c1b180862888302ddfb2e3ad9eaa63afc60cf8' (2022-05-17)
• Updated input 'home-manager':
    'github:nix-community/home-manager/778af87a981eb2bfa3566dff8c3fb510856329ef' (2022-04-26)
  → 'github:nix-community/home-manager/02b15de8ad714409358cffdc6ed518ade03402c4' (2022-05-19)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/6b4ebea9093c997c5f275c820e679108de4871ab' (2022-04-21)
  → 'github:nixos/nixos-hardware/be2b338c6a05b9e46a811119e3c5bca98a118467' (2022-05-20)
• Updated input 'nixos-unstable':
    'github:nixos/nixpkgs/e10da1c7f542515b609f8dfbcf788f3d85b14936' (2022-04-26)
  → 'github:nixos/nixpkgs/48037fd90426e44e4bf03e6479e88a11453b9b66' (2022-05-18)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/d146577610c17d7674a2d3e285fc637c520ad344' (2022-04-27)
  → 'github:nixos/nixpkgs/52dc75a4fee3fdbcb792cb6fba009876b912bfe0' (2022-05-18)
• Updated input 'stable':
    'github:nixos/nixpkgs/a3917caedfead19f853aa5769de4c3ea4e4db584' (2022-04-26)
  → 'github:nixos/nixpkgs/685d243d971c4f9655c981036b9c7bafdb728a0d' (2022-05-19)

* Patch python and neovim deps

`pyopenssl` is broken on Apple Silicon and [this PR marks it as
broken](NixOS/nixpkgs#172397) (which I think is
a little overzealous).
[This other pending PR fixes the issue](NixOS/nixpkgs#173809)
by making `trustme` an optional dependency for `aiohttp`. While the PR
is pending, I've added an overlay to accomplish the same thing — and
mark `pyopenssl` as _not_ broken, for now.

Additionally, Neovim broke in recent versions of home-manager, for some
reason. There's a workaround available [here](nix-community/home-manager#2966 (comment))
and the home-manager maintainers worked quickly to merge a fix in.

This unblocks updating all flake dependencies and gets the system config
back into working order.

Co-authored-by: flakebot <flakebot@users.noreply.github.com>
@dotlambda
Copy link
Member

dotlambda commented May 23, 2022

Please squash the commits and use an appropriate commit message.

dotlambda
dotlambda reviewed May 23, 2022
View reviewed changes
pkgs/development/python-modules/aiohttp/default.nix Outdated
Copy link
Member

@dotlambda dotlambda May 23, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Would

Suggested change
] ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [
] ++ lib.optionals (!pyopenssl.meta.broken) [

work?

Copy link
Contributor Author

@kwohlfahrt kwohlfahrt May 25, 2022

Choose a reason for hiding this comment

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

No, this is enough use of pyopenssl that nix refuses to evaluate the package.

python3Packagesaiohttp: remove trustme test dependency
e724ef2 
This is an optional test dependency dependency is no longer needed, and
makes the package unbuildable on aarch64-darwin, as it transitively
depends on pyopenssl, which is marked broken.
@kwohlfahrt
Copy link
Contributor Author

kwohlfahrt commented May 25, 2022

Sorry for the delay, rebased and squashed.

dotlambda
dotlambda requested changes May 25, 2022
View reviewed changes
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

Commit message should mention Darwin.

@dotlambda
Copy link
Member

dotlambda commented May 25, 2022 •
edited
Loading

Commit message should mention Darwin.

Never mind, it does.

@ofborg ofborg bot requested a review from dotlambda May 25, 2022 14:55
@dotlambda dotlambda merged commit df1f9ec into NixOS:master May 25, 2022
@dotlambda
Copy link
Member

dotlambda commented May 25, 2022

@kwohlfahrt Can you backport df1f9ec to release-22.05?

@dotlambda dotlambda added the 9.needs: port to stable A PR needs a backport to the stable release. label May 25, 2022
@kwohlfahrt kwohlfahrt mentioned this pull request May 25, 2022
Merged
13 tasks
@dotlambda dotlambda added 8.has: port to stable This PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels May 26, 2022
@kwohlfahrt kwohlfahrt deleted the remove-pyopenssl branch May 26, 2022 19:33
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

@mweinelt mweinelt Awaiting requested review from mweinelt

@dotlambda dotlambda Awaiting requested review from dotlambda

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kwohlfahrt @dotlambda @mweinelt

Comments