setuptools-rust-hook: Use correct python for cross #262123

kjeremy · 2023-10-19T18:30:35Z

Description of changes

Sets PYO3_PYTHON according to https://pyo3.rs/v0.20.0/building_and_distribution#cross-compiling

Setting PYO3_INCLUDE_DIR doesn't seem to be necessary for fixing #262073 but I set it for good measure.

Fixes #262073

@Artturin
@Cynerd

Things done

SuperSandro2000

not to fit on cross things but looks logical to me

Artturin · 2023-10-20T00:20:10Z

Has to target staging

kjeremy · 2023-10-20T02:46:13Z

Has to target staging

I changed the target to staging.

kjeremy · 2023-10-20T11:18:53Z

The ofborg-eval failure doesn't look related to this PR.

Artturin · 2023-10-20T17:27:11Z

@ofborg eval

kjeremy · 2023-10-20T19:52:02Z

@ofborg eval

Artturin · 2023-10-20T19:54:24Z

Gotta force-push

Do git commit --amend and git push --force

ghost · 2023-10-23T07:09:48Z

I cherry-picked this back to master but it's still trying to run hostPlatform binaries:

declare -x PYO3_CROSS_INCLUDE_DIR="/nix/store/pzlcmpd2fjc401cjsfx3b424mdl5w86b-python3-armv7l-unknown-linux-gnueabihf-3.11.5/include/python3.11"
declare -x PYO3_CROSS_LIB_DIR="/nix/store/pzlcmpd2fjc401cjsfx3b424mdl5w86b-python3-armv7l-unknown-linux-gnueabihf-3.11.5/lib/python3.11"
declare -x PYO3_PYTHON="/nix/store/pzlcmpd2fjc401cjsfx3b424mdl5w86b-python3-armv7l-unknown-linux-gnueabihf-3.11.5/bin/python3.11"

Is there something in staging but not yet in master that makes this PR work?

Also, note that setuptoolsRustBuildHook.__spliced doesn't exist. Something is really borked here.

Artturin · 2023-10-23T07:38:33Z

Also, note that setuptoolsRustBuildHook.__spliced doesn't exist. Something is really borked here.

It's this #228139
The hooks aren't spliced withing the sets callPackage but they will be spliced outside of it

pkgsCross.aarch64-multiplatform.__splicedPackages.python3Packages.setuptoolsRustBuildHook.__spliced is spliced

nix-repl> pkgsCross.aarch64-multiplatform.__splicedPackages.python3.pkgs.setuptoolsRustBuildHook.__spliced
error: attribute '__spliced' missing

is the fault of #211340

Artturin · 2023-10-23T07:55:25Z

declare -x PYO3_PYTHON="/nix/store/pzlcmpd2fjc401cjsfx3b424mdl5w86b-python3-armv7l-unknown-linux-gnueabihf-3.11.5/bin/python3.11" should be the build python I think

nix-repl> p = lib.elemAt pkgsCross.aarch64-multiplatform.__splicedPackages.python3.pkgs.cryptography.nativeBuildInputs 10
nix-repl> p.stdenv.hostPlatform.system
"aarch64-linux"

@kjeremy do you have binfmt enabled?

python.pythonForBuild.pkgs.setuptoolsRustBuildHook would make hostPlatform correct, but then the vars aren't for the target

declare -x PYO3_CROSS_INCLUDE_DIR="/nix/store/ffll6glz3gwx342z0ch8wx30p5cnqz1z-python3-3.11.5/include/python3.11"
declare -x PYO3_CROSS_LIB_DIR="/nix/store/ffll6glz3gwx342z0ch8wx30p5cnqz1z-python3-3.11.5/lib/python3.11"
declare -x PYO3_PYTHON="/nix/store/ffll6glz3gwx342z0ch8wx30p5cnqz1z-python3-3.11.5/bin/python3.11"

Artturin · 2023-10-23T08:16:05Z

Could work around it by doing pyBin = "python${python.pythonVersion}";
but then
#error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)."
for some reason, even though

declare -x PYO3_CROSS_INCLUDE_DIR="/nix/store/h4ja6mc0f8r6qnyil5vi0mjwcv4jb8y2-python3-armv7l-unknown-linux-gnueabihf-3.11.5/include/python3.11"
declare -x PYO3_CROSS_LIB_DIR="/nix/store/h4ja6mc0f8r6qnyil5vi0mjwcv4jb8y2-python3-armv7l-unknown-linux-gnueabihf-3.11.5/lib/python3.11"
declare -x PYO3_PYTHON="python3.11"

The hook for the wrong host is dragging in the python to nativeBuildInputs via propagation but that shouldn't be the issue.

Currently building on staging with no binfmt to see if there's something missing on master

ghost · 2023-10-23T08:54:14Z

Could work around it by doing pyBin = "python${python.pythonVersion}";

Eeeew.

but then
#error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)."
for some reason, even though

Can we just move all the python hooks out of hooks and into pythonPackages so they get spliced? Otherwise we're going to keep having problems like this :(

Also I think the with statement at the top of hooks/default.nix is a huge footgun.

kjeremy · 2023-10-23T12:00:04Z

declare -x PYO3_PYTHON="/nix/store/pzlcmpd2fjc401cjsfx3b424mdl5w86b-python3-armv7l-unknown-linux-gnueabihf-3.11.5/bin/python3.11" should be the build python I think
nix-repl> p = lib.elemAt pkgsCross.aarch64-multiplatform.__splicedPackages.python3.pkgs.cryptography.nativeBuildInputs 10
nix-repl> p.stdenv.hostPlatform.system
"aarch64-linux"
@kjeremy do you have binfmt enabled?

python.pythonForBuild.pkgs.setuptoolsRustBuildHook would make hostPlatform correct, but then the vars aren't for the target
declare -x PYO3_CROSS_INCLUDE_DIR="/nix/store/ffll6glz3gwx342z0ch8wx30p5cnqz1z-python3-3.11.5/include/python3.11"
declare -x PYO3_CROSS_LIB_DIR="/nix/store/ffll6glz3gwx342z0ch8wx30p5cnqz1z-python3-3.11.5/lib/python3.11"
declare -x PYO3_PYTHON="/nix/store/ffll6glz3gwx342z0ch8wx30p5cnqz1z-python3-3.11.5/bin/python3.11"

@Artturin
Yes I have binfmt enabled.

kjeremy · 2023-10-25T02:57:30Z

Not sure what the right fix is here.

ghost · 2023-10-25T04:07:56Z

Not sure what the right fix is here.

We probably need to deal with #263019 first.

Or at least implement some kind of warning if unspliced dependencies get used. Otherwise it's extremely difficult to understand what's actually going on. When unspliced dependencies get into the mix, mkDerivation will just randomly use packages from the wrong platform (e.g. you might put something in nativeBuildInputs, but mkDerivation will use the version of that dependency for the hostPlatform). Until we fix this, sorting out what's really going on is like stumbling around in the dark.

ghost · 2023-10-25T06:10:43Z

Rebase on

make-derivation.nix: lib.warn if drv.__spliced missing #263082

and then run

nix-instantiate . -A pkgsCross.armv7l-hf-multiplatform.python3Packages.cryptography

you will get

trace: warning: derivation ncurses:
                     unspliced build-host dependency ncurses
                       build=x86_64-unknown-linux-gnu
                       target=armv7l-unknown-linux-gnueabihf

trace: warning: derivation python3:
                     unspliced build-host dependency python3
                       build=x86_64-unknown-linux-gnu
                       target=armv7l-unknown-linux-gnueabihf

trace: warning: derivation !!no pname!!:
                     unspliced build-host dependency cargo-vendor-normalise
                       build=x86_64-unknown-linux-gnu
                       target=armv7l-unknown-linux-gnueabihf

trace: warning: derivation !!no pname!!:
                     unspliced build-host dependency armv7l-unknown-linux-gnueabihf-cargo-1.72.1
                       build=x86_64-unknown-linux-gnu
                       target=armv7l-unknown-linux-gnueabihf

trace: warning: derivation python3:
                     unspliced build-host dependency python3
                       build=x86_64-unknown-linux-gnu
                       target=armv7l-unknown-linux-gnueabihf

trace: warning: derivation cryptography:
                     unspliced build-host dependency setuptools-rust-setup-hook
                       build=x86_64-unknown-linux-gnu
                       target=armv7l-unknown-linux-gnueabihf

trace: warning: derivation python3:
                     unspliced build-host dependency python3
                       build=x86_64-unknown-linux-gnu
                       target=armv7l-unknown-linux-gnueabihf

So, those are the bugs we need to fix.

In order to avoid setting off the unspliced-dependency check, we need to make sure that the targetPackages.stdenv.cc.bintools used by gcc gets spliced. In order for it to be spliced, it needs a top-level entry in all-packages.nix. Therefore, this commit adds one. This also causes us to stop abusing targetPackages to access the linker, which is a good thing.

This commit adds a `lib.warn` check to stdenv.mkDerivation, causing it to emit a warning if a dependency which ought to be spliced in fact is not.

Co-authored-by: Artturi <[email protected]>

…ldInputs

…s in buildInputs" This reverts commit 0899b6b8746790eec9dc49ea4f4a6c3def072e3b.

SuperSandro2000 · 2023-12-18T19:43:45Z

@kjeremy can you do the fix noticed in the comment before this one?

kjeremy · 2023-12-18T20:12:13Z

@kjeremy can you do the fix noticed in the comment before this one?

Do you mean rebase on #263082? If so then yes I can do that. Note that my solution to this isn't correct because I had binfmt enabled.

kjeremy · 2023-12-18T20:26:56Z

@SuperSandro2000 I've rebased and did a force push

SuperSandro2000 · 2024-01-08T19:22:09Z

pkgs/stdenv/generic/make-derivation.nix

+           !(list-of-shame ? ${approximate-pname})
+          )
+
+            # Hi there!  If you're reading this, it's probably


This would be way easier to read and a lot less lines if we'd wrote one setence per line.

Yes it would be but that's part of #263082. I feel like if that got merged it would force us to address the cross-compilation issues.

kjeremy · 2024-07-18T19:04:56Z

cryptography seems to build for me now

kjeremy requested review from FRidh and jonringer as code owners October 19, 2023 18:30

github-actions bot added the 6.topic: python label Oct 19, 2023

kjeremy added 6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: rust labels Oct 19, 2023

ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 2501-5000 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ labels Oct 19, 2023

SuperSandro2000 approved these changes Oct 19, 2023

View reviewed changes

delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 20, 2023

kjeremy changed the base branch from master to staging October 20, 2023 02:45

github-actions bot removed the 6.topic: rust label Oct 20, 2023

kjeremy force-pushed the fix-pyo3-python branch from 09803f6 to 4285520 Compare October 20, 2023 19:57

delroth removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 20, 2023

ofborg bot added 10.rebuild-darwin: 5001+ and removed 10.rebuild-darwin: 2501-5000 labels Oct 21, 2023

Adam Joseph and others added 11 commits November 17, 2023 03:01

stdenv: lib.warn if drv.__splice is missing when expected

61f0912

This commit adds a `lib.warn` check to stdenv.mkDerivation, causing it to emit a warning if a dependency which ought to be spliced in fact is not.

stdenv: allow unspliced hostTarget dependencies (for now)

23bbc79

stdenv: add list-of-shame

6cae19e

Co-authored-by: Artturi <[email protected]>

gcc: use stdenv.cc.bintools instead of targetPackages_bintools in bui…

849df93

…ldInputs

isl: fix splicing failure

a42fd7a

rustc-wasm32: give it a custom pname for stdenv list-of-shame

1b1cd5d

cracklib: do not use buildPackages for self-reference (fails to splice)

6a5f5a9

stdenv: alphabetize list-of-shame

e178e10

stdenv: improve diagnostics for unspliced-dependency check

8891c0a

Revert "gcc: use stdenv.cc.bintools instead of targetPackages_bintool…

ec58a9e

…s in buildInputs" This reverts commit 0899b6b8746790eec9dc49ea4f4a6c3def072e3b.

setuptools-rust-hook: Use correct python for cross

bf46f5e

kjeremy force-pushed the fix-pyo3-python branch from 4285520 to bf46f5e Compare December 18, 2023 20:25

kjeremy requested a review from a user December 18, 2023 20:25

kjeremy requested a review from Ericson2314 as a code owner December 18, 2023 20:25

github-actions bot added the 6.topic: stdenv Standard environment label Dec 18, 2023

ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 18, 2023

kjeremy requested a review from SuperSandro2000 January 4, 2024 20:23

SuperSandro2000 reviewed Jan 8, 2024

View reviewed changes

wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 4, 2024

kjeremy closed this Jul 18, 2024

kjeremy deleted the fix-pyo3-python branch July 18, 2024 19:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

setuptools-rust-hook: Use correct python for cross #262123

setuptools-rust-hook: Use correct python for cross #262123

kjeremy commented Oct 19, 2023

SuperSandro2000 left a comment

Artturin commented Oct 20, 2023

kjeremy commented Oct 20, 2023

kjeremy commented Oct 20, 2023

Artturin commented Oct 20, 2023

kjeremy commented Oct 20, 2023

Artturin commented Oct 20, 2023 •

edited

Loading

ghost commented Oct 23, 2023

Artturin commented Oct 23, 2023

Artturin commented Oct 23, 2023 •

edited

Loading

Artturin commented Oct 23, 2023 •

edited

Loading

ghost commented Oct 23, 2023 •

edited by ghost

Loading

kjeremy commented Oct 23, 2023 •

edited

Loading

kjeremy commented Oct 25, 2023

ghost commented Oct 25, 2023 •

edited by ghost

Loading

ghost commented Oct 25, 2023

SuperSandro2000 commented Dec 18, 2023

kjeremy commented Dec 18, 2023

kjeremy commented Dec 18, 2023

SuperSandro2000 Jan 8, 2024

kjeremy Jan 9, 2024

kjeremy commented Jul 18, 2024

setuptools-rust-hook: Use correct python for cross #262123

setuptools-rust-hook: Use correct python for cross #262123

Conversation

kjeremy commented Oct 19, 2023

Description of changes

Things done

SuperSandro2000 left a comment

Choose a reason for hiding this comment

Artturin commented Oct 20, 2023

kjeremy commented Oct 20, 2023

kjeremy commented Oct 20, 2023

Artturin commented Oct 20, 2023

kjeremy commented Oct 20, 2023

Artturin commented Oct 20, 2023 • edited Loading

ghost commented Oct 23, 2023

Artturin commented Oct 23, 2023

Artturin commented Oct 23, 2023 • edited Loading

Artturin commented Oct 23, 2023 • edited Loading

ghost commented Oct 23, 2023 • edited by ghost Loading

kjeremy commented Oct 23, 2023 • edited Loading

kjeremy commented Oct 25, 2023

ghost commented Oct 25, 2023 • edited by ghost Loading

ghost commented Oct 25, 2023

SuperSandro2000 commented Dec 18, 2023

kjeremy commented Dec 18, 2023

kjeremy commented Dec 18, 2023

SuperSandro2000 Jan 8, 2024

Choose a reason for hiding this comment

kjeremy Jan 9, 2024

Choose a reason for hiding this comment

kjeremy commented Jul 18, 2024

Artturin commented Oct 20, 2023 •

edited

Loading

Artturin commented Oct 23, 2023 •

edited

Loading

Artturin commented Oct 23, 2023 •

edited

Loading

ghost commented Oct 23, 2023 •

edited by ghost

Loading

kjeremy commented Oct 23, 2023 •

edited

Loading

ghost commented Oct 25, 2023 •

edited by ghost

Loading