Skip to content

python3.pkgs.setuptools-rust: Revert "adjust setupHook inclusion condition"#482866

Merged
doronbehar merged 2 commits intostaging-nextfrom
revert-480005-pkg/bcrypt--uboot
Feb 9, 2026
Merged

python3.pkgs.setuptools-rust: Revert "adjust setupHook inclusion condition"#482866
doronbehar merged 2 commits intostaging-nextfrom
revert-480005-pkg/bcrypt--uboot

Conversation

@doronbehar
Copy link
Contributor

Reverts #480005

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 6.topic: python Python is a high-level, general-purpose programming language. labels Jan 23, 2026
@doronbehar

This comment was marked as outdated.

@doronbehar doronbehar marked this pull request as ready for review January 26, 2026 12:26
@nixpkgs-ci nixpkgs-ci bot added the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Jan 26, 2026
@nixpkgs-ci nixpkgs-ci bot removed the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Jan 26, 2026
@doronbehar doronbehar requested a review from mweinelt January 29, 2026 11:06
@doronbehar
Copy link
Contributor Author

doronbehar and others added 2 commits February 9, 2026 12:37
Fixes #476822 and #480467 . By itself this change doesn't trigger many
rebuilds, but it is easier to justify it in conjunction with the
previous commit.

Co-Authored-By: Colin <colin@uninsane.org>
@doronbehar doronbehar changed the base branch from staging to staging-next February 9, 2026 10:43
@nixpkgs-ci nixpkgs-ci bot closed this Feb 9, 2026
@nixpkgs-ci nixpkgs-ci bot reopened this Feb 9, 2026
@doronbehar doronbehar force-pushed the revert-480005-pkg/bcrypt--uboot branch from 3394125 to 6421482 Compare February 9, 2026 10:46
@doronbehar
Copy link
Contributor Author

I'd really like to get this into the current staging-next cycle - cc @vcunat .

@vcunat
Copy link
Member

vcunat commented Feb 9, 2026

The rebuild amount seems OK if it gets merged within a day or two, I'd say. But I don't have capacity to really review the change.

@doronbehar
Copy link
Contributor Author

The rebuild amount seems OK if it gets merged within a day or two, I'd say. But I don't have capacity to really review the change.

I've requested for a review from @trofi, @natsukium , @Aleksanaa , @ElvishJerricco , @DavHau , @adisbladis and @alois31, and only @alois31 reviewed #482863 . Anyway they've had ~2 weeks to reply, and I'm willing to take responsibility for any potential breakage. So I'm merging.

@doronbehar doronbehar added this pull request to the merge queue Feb 9, 2026
Merged via the queue into staging-next with commit 66ee45b Feb 9, 2026
25 checks passed
@doronbehar doronbehar deleted the revert-480005-pkg/bcrypt--uboot branch February 9, 2026 11:05
@lheckemann
Copy link
Member

I'm not sure if this is #476822 or not, but 6421482 from this PR seems to worsen the interaction between overrides and splicing:

[linus@🌲:~/nixpkgs/master]$ nix-instantiate --eval -E 'with import ./. {}; (python313.override { enableOptimizations = true; }).pythonOnBuildForHost.outPath'
"/nix/store/m1fw8l8y9ycxh5dzispbb7cwl6rra14l-python3-3.13.12"

[linus@🌲:~/nixpkgs/master]$ nix-instantiate --eval -E 'with import ./. {}; (python313.override { enableOptimizations = true; }).outPath'
"/nix/store/ll6yd15y7cg5p6wb3pz7dzpz24c5knws-python3-3.13.12"

[linus@🌲:~/nixpkgs/master]$ nix-instantiate --eval -E 'with import ./. {}; python313.outPath'
"/nix/store/m1fw8l8y9ycxh5dzispbb7cwl6rra14l-python3-3.13.12"

[linus@🌲:~/nixpkgs/master]$ git revert 64214826833482bb3b4fd89b77aabf1248abe33b
Auto-merging pkgs/development/interpreters/python/cpython/default.nix
[detached HEAD 98649e80f5af] Revert "python3: let lib.mkScopeWithSplicing do its job"
 1 file changed, 9 insertions(+), 3 deletions(-)

[linus@🌲:~/nixpkgs/master]$ nix-instantiate --eval -E 'with import ./. {}; (python313.override { enableOptimizations = true; }).pythonOnBuildForHost.outPath'
"/nix/store/ll6yd15y7cg5p6wb3pz7dzpz24c5knws-python3-3.13.12"

[linus@🌲:~/nixpkgs/master]$ nix-instantiate --eval -E 'with import ./. {}; (python313.override { enableOptimizations = true; }).outPath'
"/nix/store/ll6yd15y7cg5p6wb3pz7dzpz24c5knws-python3-3.13.12"

In the absence of cross, I'd expect pythonOnBuildForHost to be the same as the regular python, but here it ends up being the non-overridden one again. This breaks pyproject-nix's venvs when using an overridden python, since the shebangs are different from the expected ones, and don't get fixed.

cc @adisbladis

@doronbehar
Copy link
Contributor Author

Here's a proposed fix:

Indeed that inputs' line wasn't completely useless.

@adisbladis
Copy link
Member

@lheckemann I've implemented a workaround in pyproject-nix/pyproject.nix#420. Could you test this and see if it fixes the problem for you?

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: 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

Development

Successfully merging this pull request may close these issues.

4 participants