Skip to content

[Backport release-25.11] buildPython*: simplify overrideStdenvCompat and add nested-override support#470197

Merged
MattSturgeon merged 4 commits intorelease-25.11from
backport-455764-to-release-25.11
Dec 13, 2025
Merged

[Backport release-25.11] buildPython*: simplify overrideStdenvCompat and add nested-override support#470197
MattSturgeon merged 4 commits intorelease-25.11from
backport-455764-to-release-25.11

Conversation

@nixpkgs-ci
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented Dec 12, 2025

Bot-based backport to release-25.11, triggered by a label in #455764.

Before merging, ensure that this backport is acceptable for the release.

Even as a non-committer, if you find that it is not acceptable, leave a comment.

Tip

If you maintain all packages touched by this pull request, and they are all located under pkgs/by-name/*, you can comment @NixOS/nixpkgs-merge-bot merge to automatically merge this PR using the nixpkgs-merge-bot.

`fdrv` → `newArgs`; the parameter is not a derivation, so fdrv is
confusing.

(cherry picked from commit 37655d3)
The underlying `mk-python-derivation.nix` functions do not have `stdenv`
in their functionArgs, so it was redundant to explicitly remove it.

(cherry picked from commit 9d87f17)
Avoid passing `stdenv` to the underlying function when it is already
handled in overrideStdenvCompat.

(cherry picked from commit 32ecc22)
This is needed to support the deprecated method of overriding `stdenv`
via `overridePythonAttrs`.

(cherry picked from commit 553a6c3)
@nixpkgs-ci nixpkgs-ci bot requested review from mweinelt and natsukium December 12, 2025 17:14
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 6.topic: python Python is a high-level, general-purpose programming language. 4.workflow: backport This targets a stable branch labels Dec 12, 2025
@ShamrockLee
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 470197
Commit: d56c0d1775fc6e1a96497e194fa34626baf27bdd (subsequent changes)
Merge: b7a4b4bc78823d961fa50e62bea25a865296fe3e

Logs: https://github.com/ShamrockLee/nixpkgs-review-gha/actions/runs/20188771428


x86_64-linux

✅ 1 package built:
  • tests.overriding

aarch64-linux

✅ 1 package built:
  • tests.overriding

x86_64-darwin (sandbox = relaxed)

✅ 1 package built:
  • tests.overriding

aarch64-darwin (sandbox = relaxed)

✅ 1 package built:
  • tests.overriding

@MattSturgeon MattSturgeon added this pull request to the merge queue Dec 13, 2025
Merged via the queue into release-25.11 with commit 60b3fc1 Dec 13, 2025
50 of 54 checks passed
@MattSturgeon MattSturgeon deleted the backport-455764-to-release-25.11 branch December 13, 2025 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants