Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doronbehar merged 2 commits into from
Feb 9, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbe7825
python3.pkgs.setuptools-rust: revert "adjust setupHook inclusion cond…
doronbehar Jan 23, 2026
6421482
python3: let lib.mkScopeWithSplicing do its job
doronbehar Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions pkgs/development/interpreters/python/cpython/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,6 @@ let

passthru =
let
# When we override the interpreter we also need to override the spliced versions of the interpreter
inputs' = lib.filterAttrs (n: v: n != "passthruFun" && !lib.isDerivation v) inputs;
# Memoization of the splices to avoid re-evaluating this function for all combinations of splices e.g.
# python3.pythonOnBuildForHost.pythonOnBuildForTarget == python3.pythonOnBuildForTarget by consuming
# __splices as an arg and using the cache if populated.
Expand All @@ -170,13 +168,9 @@ let
override =
attr:
let
python = attr.override (
inputs'
// {
self = python;
__splices = splices;
}
);
python = attr.override {
self = python;
};
in
python;
in
Expand Down
9 changes: 2 additions & 7 deletions pkgs/development/python-modules/setuptools-rust/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,11 @@ buildPythonPackage rec {
# integrate the setup hook to set up the build environment for cross compilation
# this hook is automatically propagated to consumers using setuptools-rust as build-system
#
# No need for the setup hook when python.pythonOnTargetForTarget is empty,
# or when the host & target platforms are the same.
#
# Only include the setup hook if python.pythonOnTargetForTarget is not empty.
# python.pythonOnTargetForTarget is not always available, for example in
# pkgsLLVM.python3.pythonOnTargetForTarget. cross build with pkgsLLVM should not be affected.
setupHook =
if
python.pythonOnTargetForTarget == { }
|| (lib.systems.equals stdenv.hostPlatform stdenv.targetPlatform)
then
if python.pythonOnTargetForTarget == { } then
null
else
replaceVars ./setuptools-rust-hook.sh {
Expand Down
Loading