Skip to content

buildPython*: Enable direct attribute overriding via overrideAttrs (the staging ones)#377057

Merged
mweinelt merged 1 commit intoNixOS:stagingfrom
ShamrockLee:build-python-direct-overriding-staging
Feb 8, 2025
Merged

buildPython*: Enable direct attribute overriding via overrideAttrs (the staging ones)#377057
mweinelt merged 1 commit intoNixOS:stagingfrom
ShamrockLee:build-python-direct-overriding-staging

Conversation

@ShamrockLee
Copy link
Contributor

@ShamrockLee ShamrockLee commented Jan 26, 2025

Always pass catchConflicts and dontWrapPythonProrgams to make them overridable via overrideAttrs.

Depends on:

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Jan 26, 2025
@nixos-discourse
Copy link

nixos-discourse commented Feb 1, 2025

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/is-it-possible-to-override-cargosha256-in-buildrustpackage/4393/22

@ShamrockLee ShamrockLee mentioned this pull request Feb 2, 2025
Merged
13 tasks
@ShamrockLee ShamrockLee changed the base branch from master to staging February 3, 2025 18:49
@ShamrockLee ShamrockLee force-pushed the build-python-direct-overriding-staging branch 2 times, most recently from 8149095 to 46cfcf7 Compare February 3, 2025 22:22
@ShamrockLee
Copy link
Contributor Author

ShamrockLee commented Feb 3, 2025 •
edited
Loading

Amended the commit with no changes to force re-running of GitHub Action checks.

@ShamrockLee ShamrockLee marked this pull request as ready for review February 3, 2025 22:33
@ShamrockLee
buildPython*: always specify attributes catchConflicts and dontWrapPy…
4134fdc 
…thonPrograms

Always specify catchConflicts and dontWrapPythonPrograms.

Make them overrideAttrs-overridable.
@nix-owners nix-owners bot requested review from mweinelt and natsukium February 3, 2025 22:36
@ShamrockLee ShamrockLee force-pushed the build-python-direct-overriding-staging branch from 46cfcf7 to 4134fdc Compare February 3, 2025 22:38
@ShamrockLee ShamrockLee mentioned this pull request Feb 5, 2025
Open
@mweinelt mweinelt merged commit 534cbec into NixOS:staging Feb 8, 2025
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@natsukium natsukium Awaiting requested review from natsukium

@mweinelt mweinelt Awaiting requested review from mweinelt

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must 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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ShamrockLee @nixos-discourse @mweinelt