Skip to content

python3*: backport fix for armv7l, aarch64, riscv64#325218

Merged
mweinelt merged 1 commit intoNixOS:masterfrom
flokli:fix-python3-cross
Jul 7, 2024
Merged

python3*: backport fix for armv7l, aarch64, riscv64#325218
mweinelt merged 1 commit intoNixOS:masterfrom
flokli:fix-python3-cross

Conversation

@flokli
Copy link
Member

@flokli flokli commented Jul 7, 2024

Description of changes

This is https://cyberchaos.dev/yuka/nixpkgs/-/commit/95ac42d878d756122fbd63a1295b89deaeed0a82 cherry-picked, extended for aarch64, and conditionalized on cross to minimize rebuilds.

Fixes #325213.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Co-Authored-By: Florian Klink <flokli@flokli.de>
Signed-off-by: Yureka <fork-nixpkgs-with@yuka.dev>
@flokli flokli requested a review from natsukium as a code owner July 7, 2024 09:20
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Jul 7, 2024
@flokli flokli requested review from mweinelt and yu-re-ka July 7, 2024 09:21
@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 Jul 7, 2024
@flokli flokli requested a review from K900 July 7, 2024 10:28
@mweinelt mweinelt merged commit 21121dc into NixOS:master Jul 7, 2024
@flokli flokli deleted the fix-python3-cross branch July 7, 2024 13:23
@flokli
Copy link
Member Author

flokli commented Jul 7, 2024

Thanks!

@alyssais
Copy link
Member

conditionalized on cross to minimize rebuilds

Please make this sort of thing unconditional on staging after it's merged — unnecessarily conditionally applied patches lead to annoying problems in future — e.g. a patch no longer applying, but not being tested by the person doing the update, or in this case, the list of platforms used in the condition was non-exhaustive, so I just spent a lot of time chasing the same issue for s390.

@alyssais
Copy link
Member

#327882

@cleverca22
Copy link
Contributor

the fix is also required on powerpc, and the conditional patching omits the fix there

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

Labels

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.

Build failure: python3 cross

5 participants

Comments