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

Fix i686-linux tests #195656

Merged
merged 3 commits into from
Oct 12, 2022
Merged

Fix i686-linux tests #195656

merged 3 commits into from
Oct 12, 2022

Conversation

mweinelt
Copy link
Member

pyca/bcrypt#407

Description of changes
Things done
  • Built on platform(s)
    • i686-linux
    • 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.

@FRidh
Copy link
Member

FRidh commented Oct 12, 2022

Could you add the motivation to the commit message?

@mweinelt
python3Packages.bcrypt: Revert to 3.2.2 on i686-linux
7d3e7f4 
The latest bcrypt version segfaults during test_kdf, which prevents the
package from building. The package is in the critical chain for many
NixOS tests, which currently won't complete on i686-linux.

Upstream-Issue: pyca/bcrypt#407
@mweinelt
Copy link
Member Author

Done.

@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 Oct 12, 2022
@mweinelt
Copy link
Member Author

Looks like mypy needs a nudge as well to get things going.

@mweinelt
python3Packages.mypy: Disable mypy.report import on i686-linux
0310ac4 
Importing the mypy.report fails due to a circular import.
@mweinelt mweinelt changed the title python3Packages.bcrypt: Revert to 3.2.2 on i686-linux Fix i686-linux tests Oct 12, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500 and removed 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 Oct 12, 2022
@mweinelt mweinelt merged commit e44983d into NixOS:master Oct 12, 2022
@mweinelt mweinelt deleted the python-bcrypt branch October 12, 2022 12:34
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

@LnL7 LnL7 Awaiting requested review from LnL7

@martingms martingms Awaiting requested review from martingms

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mweinelt @FRidh