Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/etc: fix using etc overlay on cross-compiled systems #305694

Merged
merged 1 commit into from
Jun 27, 2024

Conversation

jmbaur
Copy link
Contributor

@jmbaur jmbaur commented Apr 21, 2024

Description of changes

We need to run tooling from the build platform when generating the EROFS.

Things done

  • Built on platform(s)
    • x86_64-linux (for aarch64)
    • 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.

@jmbaur jmbaur requested a review from dasJ as a code owner April 21, 2024 08:58
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Apr 21, 2024
@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: 1-10 labels Apr 21, 2024
@jmbaur jmbaur requested a review from nikstur April 21, 2024 09:29
We need to run tooling from the build platform when generating the EROFS.
@jmbaur jmbaur force-pushed the etc-overlay-cross branch from 01ea3a8 to 560cd87 Compare June 27, 2024 02:50
@jmbaur
Copy link
Contributor Author

jmbaur commented Jun 27, 2024

@Mic92 I rebased my changes on top of your recent commits, but I think we also need to fix the package set where composefs and erofs-utils come from

@jmbaur jmbaur requested a review from Mic92 June 27, 2024 02:51
@Mic92 Mic92 merged commit 75c624a into NixOS:master Jun 27, 2024
23 checks passed
@Mic92
Copy link
Member

Mic92 commented Jun 27, 2024

Backport in #322695

@jmbaur jmbaur deleted the etc-overlay-cross branch June 27, 2024 07:12
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: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants