Skip to content

Comments

[Backport release-22.05] python3Packages.aiohttp: remove trustme test dependency on aarch64-darwin#174597

Merged
dotlambda merged 1 commit intoNixOS:release-22.05from
kwohlfahrt:remove-pyopenssl-backport
May 26, 2022
Merged

[Backport release-22.05] python3Packages.aiohttp: remove trustme test dependency on aarch64-darwin#174597
dotlambda merged 1 commit intoNixOS:release-22.05from
kwohlfahrt:remove-pyopenssl-backport

Conversation

@kwohlfahrt
Copy link
Contributor

Backport as requested in #173809. cc @dotlambda

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.

Description of changes
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.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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label May 25, 2022
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label May 25, 2022
@ofborg ofborg bot requested a review from dotlambda May 25, 2022 20:29
@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. labels May 25, 2022
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.

Use git cherry-pick -x.

…rwin

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.

(cherry picked from commit df1f9ec)
@kwohlfahrt kwohlfahrt force-pushed the remove-pyopenssl-backport branch from 1793b48 to d5f37bf Compare May 26, 2022 09:15
@kwohlfahrt
Copy link
Contributor Author

Sorry, fixed.

@kwohlfahrt kwohlfahrt requested a review from dotlambda May 26, 2022 09:16
@dotlambda dotlambda merged commit 787b164 into NixOS:release-22.05 May 26, 2022
@kwohlfahrt kwohlfahrt deleted the remove-pyopenssl-backport branch May 26, 2022 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 6.topic: python Python is a high-level, general-purpose programming language. 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

Development

Successfully merging this pull request may close these issues.

2 participants