Skip to content

thrift: fix python3 nativeBuildInputs#368304

Closed
tobim wants to merge 1 commit into
NixOS:masterfrom
tobim:topic/thrift-workaround-splicing-issue
Closed

thrift: fix python3 nativeBuildInputs#368304
tobim wants to merge 1 commit into
NixOS:masterfrom
tobim:topic/thrift-workaround-splicing-issue

Conversation

@tobim

@tobim tobim commented Dec 26, 2024

Copy link
Copy Markdown
Contributor

python3.pkgs appears to have issues with splicing. When building it in pkgsCross, or pkgsStatic the derivation uses the hostPlatform variant of setuptools as an input, but we want them for buildPlatform instead.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@tobim tobim marked this pull request as draft December 26, 2024 11:36
@tobim

tobim commented Dec 26, 2024

Copy link
Copy Markdown
Contributor Author

nix-diff indicates that switching to withPackages doesn't help:

nix-diff /nix/store/whkcs0mgfgsczdkb0ihpqvng4lvrq2i2-thrift-stat
ic-x86_64-unknown-linux-musl-0.18.1.drv /nix/store/x4l7zvj9rsl21gnjkc6dlhifdirzsii9-thrift-static-x86_64-unknown-linux-musl-0.
18.1.drv
- /nix/store/whkcs0mgfgsczdkb0ihpqvng4lvrq2i2-thrift-static-x86_64-unknown-linux-musl-0.18.1.drv:{out}
+ /nix/store/x4l7zvj9rsl21gnjkc6dlhifdirzsii9-thrift-static-x86_64-unknown-linux-musl-0.18.1.drv:{out}
• The set of input derivation names do not match:
    - python3-3.12.8
    - python3.12-setuptools-75.3.0-x86_64-unknown-linux-musl
    + python3-static-x86_64-unknown-linux-musl-3.12.8-env
• The environments do not match:
    nativeBuildInputs=''
    /nix/store/divlf5r1szymxm91idm9v76nmawjsplz-bison-3.8.2 /nix/store/38cffsqqx823crf1i4bcf6zz1qz1hgpd-cmake-3.30.5 /nix/store/gmhlgmbc9fdkyq68w601vnv9l09899hb-flex-2.6.4 /nix/store/01rcbfq8pmkk8nxxia2jwgrp2g0w4fmf-x86_64-unknown-linux-musl-pkg-config-wrapper-0.29.2 /nix/store/c9m6yd8fg1flz2j5r4bif1ib5j20a0cy-python3-3.12.8 /nix/store/m3gsnx49mnpzkmp56pysrc64106cai1r-python3.12-setuptools-75.3.0-x86_64-unknown-linux-musl/nix/store/sgpmz9cvgp0j9sfdi7q2p8jbid93ia7b-python3-static-x86_64-unknown-linux-musl-3.12.8-env
''

🫤

@github-actions github-actions Bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Dec 26, 2024
`python3.pkgs` appears to have issues with splicing. When building it
in `pkgsCross`, or `pkgsStatic` the derivation uses the `hostPlatform`
variant of `setuptools` as an input, but we want them for `buildPlatform`
instead.
@tobim tobim force-pushed the topic/thrift-workaround-splicing-issue branch from 4d2ff92 to 0fb387a Compare December 26, 2024 12:22
@tobim

tobim commented Dec 26, 2024

Copy link
Copy Markdown
Contributor Author

Better solution in #296770.

@tobim tobim closed this Dec 26, 2024
@github-actions github-actions Bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Dec 26, 2024
@tobim tobim deleted the topic/thrift-workaround-splicing-issue branch December 26, 2024 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant