Skip to content

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

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
mweinelt merged 1 commit into from
Feb 8, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions pkgs/development/interpreters/python/mk-python-derivation.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ let
"nativeCheckInputs"
"doCheck"
"doInstallCheck"
"dontWrapPythonPrograms"
"catchConflicts"
"pyproject"
"format"
"disabledTestPaths"
Expand Down Expand Up @@ -282,14 +280,16 @@ let

name = namePrefix + name;

inherit catchConflicts;

nativeBuildInputs =
[
python
wrapPython
ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)?
pythonRemoveTestsDirHook
]
++ optionals (catchConflicts && !isBootstrapPackage && !isSetuptoolsDependency) [
++ optionals (finalAttrs.catchConflicts && !isBootstrapPackage && !isSetuptoolsDependency) [
#
# 1. When building a package that is also part of the bootstrap chain, we
# must ignore conflicts after installation, because there will be one with
Expand Down Expand Up @@ -386,8 +386,10 @@ let
nativeInstallCheckInputs = nativeCheckInputs;
installCheckInputs = checkInputs;

inherit dontWrapPythonPrograms;

postFixup =
optionalString (!dontWrapPythonPrograms) ''
optionalString (!finalAttrs.dontWrapPythonPrograms) ''
wrapPythonPrograms
''
+ attrs.postFixup or "";
Expand Down