Skip to content

python3Packages.sphinxHook: Fix cross compilation#249157

Merged
Artturin merged 1 commit intoNixOS:masterfrom
OroraTech:chore/fix-sphinx-hook
Sep 9, 2023
Merged

python3Packages.sphinxHook: Fix cross compilation#249157
Artturin merged 1 commit intoNixOS:masterfrom
OroraTech:chore/fix-sphinx-hook

Conversation

@kip93
Copy link
Contributor

@kip93 kip93 commented Aug 14, 2023

Fixes build of wrapt. Also removed the now irrelevant workaround on beautifulsoup4.

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux (cross compiled from x86_64-linux)
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

@kip93 kip93 requested review from FRidh and jonringer as code owners August 14, 2023 16:48
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Aug 14, 2023
@ofborg ofborg bot added 6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Aug 14, 2023
@kip93 kip93 changed the base branch from master to staging August 25, 2023 13:32
@kip93 kip93 force-pushed the chore/fix-sphinx-hook branch from 4f4f118 to 2da3714 Compare August 25, 2023 13:32
@kip93
Copy link
Contributor Author

kip93 commented Aug 25, 2023

Changed target branch to staging and rebased due to number of rebuilds.

@kip93 kip93 force-pushed the chore/fix-sphinx-hook branch 2 times, most recently from 100ae35 to c7454bd Compare September 5, 2023 09:45
@Artturin
Copy link
Member

Artturin commented Sep 9, 2023

hooks/default change no longer necessary since #247245

nix-repl> pkgsCross.aarch64-multiplatform.__splicedPackages.python3Packages.sphinxHook.__spliced
{ buildBuild = «derivation /nix/store/85jbgw8qis73zzjb8jr42zm375m8r7nk-python3.10-sphinx-hook.drv»; buildHost = «derivation /nix/store/85jbgw8qis73zzjb8jr42zm375m8r7nk-python3.10-sphinx-hook.drv»; buildTarget = «derivation /nix/store/85jbgw8qis73zzjb8jr42zm375m8r7nk-python3.10-sphinx-hook.drv»; hostHost = «derivation /nix/store/dc6yabkisig7aifmvgynz41wni6jzbcf-python3.10-sphinx-hook.drv»; hostTarget = «derivation /nix/store/dc6yabkisig7aifmvgynz41wni6jzbcf-python3.10-sphinx-hook.drv»; }

@kip93
Copy link
Contributor Author

kip93 commented Sep 9, 2023

Just rebased with staging to be sure, but it still fails to cross compile wrap without this, with the same error

Copy link
Member

@Artturin Artturin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I forgot that my pr only fixed splicing python3Packages.callPackage { python }: while the hook splicing within the set (used by callPackage) is still broken and will eventually be fixed by #228139

the rebuilds are a bit weird so i'll check why that is happening

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Sep 9, 2023
@kip93 kip93 force-pushed the chore/fix-sphinx-hook branch from c7454bd to 2177094 Compare September 9, 2023 18:24
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Sep 9, 2023
Failed due to using host sphinx instead of build one.
@kip93 kip93 force-pushed the chore/fix-sphinx-hook branch from 2177094 to a391639 Compare September 9, 2023 19:34
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. labels Sep 9, 2023
@kip93 kip93 changed the base branch from staging to master September 9, 2023 19:35
@github-actions github-actions bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. labels Sep 9, 2023
@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Sep 9, 2023
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Sep 9, 2023
@Artturin
Copy link
Member

Artturin commented Sep 9, 2023

I checked and there's really no rebuilds, rebuild count is likely just because of a rebase gone wrong

@Artturin Artturin merged commit de63d2e into NixOS:master Sep 9, 2023
kip93 added a commit to OroraTech/nixpkgs that referenced this pull request Sep 30, 2023
@kip93 kip93 deleted the chore/fix-sphinx-hook branch September 30, 2023 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: python Python is a high-level, general-purpose programming language. 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants