Skip to content

buildPythonPackage: preserve the disabled effect after <pkg>.overrideAttrs#376419

Merged
mweinelt merged 1 commit intoNixOS:masterfrom
ShamrockLee:build-python-fix-disable
May 23, 2025
Merged

buildPythonPackage: preserve the disabled effect after <pkg>.overrideAttrs#376419
mweinelt merged 1 commit intoNixOS:masterfrom
ShamrockLee:build-python-fix-disable

Conversation

@ShamrockLee
Copy link
Contributor

@ShamrockLee ShamrockLee commented Jan 24, 2025

Closes #376404

Depends on #376430 so as not to lose vcard. That one is merged.

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 the 6.topic: python Python is a high-level, general-purpose programming language. label Jan 24, 2025
@ShamrockLee ShamrockLee changed the title Build python fix disable buildPython*; make disablePythonPackage respect overrideAttrs Jan 24, 2025
@github-actions github-actions 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 Jan 24, 2025
@ShamrockLee ShamrockLee force-pushed the build-python-fix-disable branch 2 times, most recently from ee67ad1 to 23a37cb Compare January 24, 2025 15:48
@ShamrockLee ShamrockLee marked this pull request as ready for review January 24, 2025 15:56
@nix-owners nix-owners bot requested review from mweinelt and natsukium January 24, 2025 15:58
@ShamrockLee ShamrockLee changed the title buildPython*; make disablePythonPackage respect overrideAttrs buildPython*: make disablePythonPackage respect overrideAttrs Jan 24, 2025
@ShamrockLee ShamrockLee force-pushed the build-python-fix-disable branch from 23a37cb to f6a5a09 Compare February 2, 2025 16:22
@ShamrockLee
Copy link
Contributor Author

Rebased on top of master.

@ShamrockLee ShamrockLee force-pushed the build-python-fix-disable branch from 0c77b7f to bb3a41f Compare April 11, 2025 08:35
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 11, 2025
@ShamrockLee ShamrockLee changed the title buildPython*: make disablePythonPackage respect overrideAttrs buildPythonPackage: preserve the disabled effect after <pkg>.overrideAttrs Apr 14, 2025
@mweinelt mweinelt merged commit a64a02f into NixOS:master May 23, 2025
35 checks passed
@ShamrockLee ShamrockLee added 12.approvals: 1 This PR was reviewed and approved by one person. backport release-25.05 labels May 23, 2025
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 23, 2025

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. 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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

toPythonModule discards the effect of buildPython* disabled attribute

3 participants