Skip to content

haskell.compiler: also build manual for cross-compilers#275616

Merged
maralorn merged 1 commit intoNixOS:haskell-updatesfrom
sternenseemann:ghc-cross-docs
Jan 1, 2024
Merged

haskell.compiler: also build manual for cross-compilers#275616
maralorn merged 1 commit intoNixOS:haskell-updatesfrom
sternenseemann:ghc-cross-docs

Conversation

@sternenseemann
Copy link
Copy Markdown
Member

The reasoning given for disabling it is flawed: In most cases, sphinx and its dependencies are already in the binary cache, since we only need them as build tools—sphinx for the build platform is just the normal pkgs.sphinx, since it doesn't care about targetPlatform.

We just need to disable it when the buildPlatform is also musl, so we avoid pulling in sphinx in pkgsMusl.

Description of changes

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Dec 20, 2023
@sternenseemann sternenseemann changed the base branch from master to haskell-updates December 20, 2023 11:05
The reasoning given for disabling it is flawed: In most cases, sphinx
and its dependencies are already in the binary cache, since we only need
them as build tools—sphinx for the build platform is just the normal
pkgs.sphinx, since it doesn't care about targetPlatform.

We just need to disable it when the buildPlatform is also musl, so we
avoid pulling in sphinx in pkgsMusl.
@ofborg ofborg bot added 6.topic: cross-compilation Building packages on a different platform than they will be used on 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. labels Dec 20, 2023
@maralorn
Copy link
Copy Markdown
Member

maralorn commented Jan 1, 2024

Thx!

@maralorn maralorn merged commit 0bd0847 into NixOS:haskell-updates Jan 1, 2024
@sternenseemann sternenseemann deleted the ghc-cross-docs branch January 2, 2024 09:49
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: haskell General-purpose, statically typed, purely functional programming language 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.

2 participants