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

Jump to bottom

Build packages for config builders #62333

Merged
merged 3 commits into from Jun 5, 2019
Merged

Build packages for config builders #62333

merged 3 commits into from Jun 5, 2019

Conversation

kampka
Copy link
Contributor

@kampka kampka commented May 31, 2019 •
edited

Motivation for this change

When cross building a system configuration using NixOps and nixpkgs.crossSystem, the builder for extlinux is run on the target host and not the build system.
The current abstraction places the buildPkgs into the builders path, making the builder fail with unsupported execution formats for things like coreutils.

I was not able to test the sd-image as it won't cross-compile for me.

This change incorporates feedback from #62318

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@kampka kampka mentioned this pull request May 31, 2019
Closed
10 tasks
kampka and others added 3 commits May 31, 2019 23:27
@kampka
Revert "extlinux-conf: fix cross compilation"
fd15f37 
This reverts commit f17dd04.
@kampka
Revert "treewide: use buildPackages for config builders"
0d570e0 
This reverts commit 35af6e3.
@matthewbauer @kampka
treewide: use buildPackages for config builders
f2a8948 
Partially reapplies 35af6e3

buildPackages need to be used only for image builders.
Otherwise, the bootloader builder may be setup using the wrong arch,
rendering it unusable
@kampka kampka force-pushed the buildPackages-for-config-builders branch from c794125 to f2a8948 Compare May 31, 2019 21:28
@matthewbauer matthewbauer merged commit f8c12ed into NixOS:master Jun 5, 2019
@eadwu eadwu mentioned this pull request Aug 12, 2019
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@kampka @sielicki @matthewbauer