python3.pkgs.setuptools-rust: adjust setupHook inclusion condition#480005
python3.pkgs.setuptools-rust: adjust setupHook inclusion condition#480005Aleksanaa merged 1 commit intoNixOS:stagingfrom
Conversation
|
BTW I'm surprised there are no rebuilds triggered. There are many packages that use |
|
Aish I see this change breaks stage 3 cross compilation.. E.g: nix build -Lf. pkgsCross.armv7l-hf-multiplatform.python3.pkgs.libcstI'm putting this in draft. |
fc327e7 to
18cce99
Compare
18cce99 to
8c2eed2
Compare
Commit e656303 (PR NixOS#467817) made `setuptools-rust` work automatically in cross compilation scenarios by replacing `setuptoolsRustBuildHook` with `setuptools-rust.setupHook`. However it broke builds such as: ```sh nix build -Lf. pkgsCross.armv7l-hf-multiplatform.buildPackages.python3.pkgs.cryptography ``` As reported here: NixOS#467817 (comment) This adjustment fixes the above build, while also maintaining the following working: ```sh nix build -Lf. pkgsCross.armv7l-hf-multiplatform.python3.pkgs.libcst ```
8c2eed2 to
9384d60
Compare
|
Now everything should be working. Waiting for your review @DavHau & @Aleksanaa . |
|
This fixes #480467 though I can't say I understand why; whenever I see references to (In particular for my use case, cross-compiled |
bcrypt was failing so backport NixOS/nixpkgs#480005 until it lands in mainline Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
bcrypt was failing so backport NixOS/nixpkgs#480005 until it lands in mainline Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
bcrypt was failing so backport NixOS/nixpkgs#480005 until it lands in mainline Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
#476822 is the "real" issue here. e.g., the other fix for #480467 was to just axe the custom splicing logic from python packages and let diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 13ede05bf2b7..ec88d1e72703 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -171,10 +171,9 @@ let
attr:
let
python = attr.override (
- inputs'
- // {
+ {
self = python;
- __splices = splices;
}
);
in |
Fixes NixOS#476822 and NixOS#480467 . If merged, NixOS#480005 should be reverted (on branch `staging`). Co-Authored-By: Colin <colin@uninsane.org>
Thanks for the link ! @alois31 should be aware that this PR should work-around the substantial issue presented there. And damn you are right @uninsane - what you suggested seems right and it fixes the issue too, while not even triggering any rebuilds! See: This PR should be reverted if the above is accepted. |
Fixes NixOS#476822 and NixOS#480467 . If merged, NixOS#480005 should be reverted (on branch `staging`). Co-Authored-By: Colin <colin@uninsane.org>
Fixes NixOS#476822 and NixOS#480467 . If merged, NixOS#480005 should be reverted (on branch `staging`). Co-Authored-By: Colin <colin@uninsane.org>
|
@Aleksanaa & @ElvishJerricco , I'd like to merge the PR that reverts this: Before this PR reaches |
Fixes NixOS#476822 and NixOS#480467 . If merged, NixOS#480005 should be reverted (on branch `staging`). Co-Authored-By: Colin <colin@uninsane.org>
Fixes NixOS#476822 and NixOS#480467 . If merged, NixOS#480005 should be reverted (on branch `staging`). Co-Authored-By: Colin <colin@uninsane.org>
Fixes NixOS#476822 and NixOS#480467 . If merged, NixOS#480005 should be reverted (on branch `staging`). Co-Authored-By: Colin <colin@uninsane.org>
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.