python3: splice python within python3Packages.callPackage#245475
Merged
Artturin merged 1 commit intoNixOS:masterfrom Jul 26, 2023
Merged
python3: splice python within python3Packages.callPackage#245475Artturin merged 1 commit intoNixOS:masterfrom
Artturin merged 1 commit intoNixOS:masterfrom
Conversation
github-actions
bot
added
the
6.topic: python
Artturin
force-pushed
the
splicepython1
branch
2 times, most recently
from
5c8d10d to
c539510
Compare
`lib.extends hooks pythonPackagesFun` includes python which we want to splice what this fixes: ``` nix-repl> lib.elemAt pkgsCross.aarch64-multiplatform.python3Packages.xpybutil.nativeBuildInputs 0 «derivation /nix/store/39dkb51rciw6zwg0c2c44gpmpjapddxc-python3-aarch64-unknown-linux-gnu-3.10.12.drv» ``` to ``` nix-repl> lib.elemAt pkgsCross.aarch64-multiplatform.python3Packages.xpybutil.nativeBuildInputs 0 «derivation /nix/store/21ldw2dp26xvv9iyxn9x77a8yh4waqz5-python3-3.10.12.drv» ``` Before NixOS#194205 The keep python used to work by accident because self was passed from __splicedPackages https://github.com/NixOS/nixpkgs/pull/196052/files#diff-44ce3495c4f983ce64dd47c86a9d3e77bad210b2709c098a3806998dcd9b000bR213 But now it does not work because overrideAttrs is used on python in python-packages-base.nix Preferably we would [ splice the hooks too ](NixOS#228139) but we cannot do that until [Package sets within derivations (i.e. python3.pkgs) are not spliced](NixOS#211340) is fixed, because people often use `python3.pkgs.wrapPython` in `nativeBuildInputs` (it's correct but python3.pkgs should be python3Packages to get splicing.
Artturin
changed the title
Member
Author
|
diff of pkgsCross.aarch64-multiplatform.sway` in #228139 without removing this PR has much less diffs |
Member
Author
|
See #228139 for more thoughts and what should really be merged but it breaks some things. |
ofborg
bot
added
10.rebuild-darwin: 0
ghost
approved these changes
Jul 26, 2023
ghost
left a comment
ghost
left a comment
There was a problem hiding this comment.
Er... splicing, python, and setup-hooks are probably my three least-favorite subjects 😄
I will be honest, I don't fully understand this, mainly because I have actively avoided learning anything about our Python infrastructure. But I think the intersection of people with deep understanding of both nixpkgs cross-compilation and python is basically the singleton set containing this PR's author, so I did my best.
I don't see anything awful in here, and it's a zero-rebuild PR so if it breaks stuff people can throw 💩 at me and we'll just fix it when the time comes.
12 tasks
|
Argh, this breaks #212795 ( I should not have approved this. @Artturin is it okay if I revert this and merge #212795 first? It is more urgent, and has been waiting for a while now. |
ghost
mentioned this pull request
13 tasks
Member
Author
|
Ok |
ghost
mentioned this pull request
|
Trying to figure out exactly what went wrong here. This helped make things a bit easier to understand: |
|
This makes my brain hurt. I fought valiantly, but did not vanquish our foe. But I think the issue can be narrowed down to: These two uses of |
Member
Author
I'll think about it |
ghost
mentioned this pull request
12 tasks
Member
Author
|
Revert was reverted #247245 |
Merged
12 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
lib.extends hooks pythonPackagesFunincludes python which we want to splicewhat this fixes:
to
Before #194205 The keep python used to work by accident because self was passed from __splicedPackages https://github.com/NixOS/nixpkgs/pull/196052/files#diff-44ce3495c4f983ce64dd47c86a9d3e77bad210b2709c098a3806998dcd9b000bR213 But now it does not work because overrideAttrs is used on python in python-packages-base.nix
Preferably, we splice the hooks too but we cannot do that until Package sets within derivations (i.e. python3.pkgs) are not spliced is fixed, because people often use
python3.pkgs.wrapPythoninnativeBuildInputs(it's correct, but python3.pkgs should be python3Packages to get splicing.Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)