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.

Sign up for GitHub

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

Cross fixes for 18.09 #48377

Merged
merged 2 commits into from Oct 14, 2018
Merged

Cross fixes for 18.09 #48377

merged 2 commits into from Oct 14, 2018

Conversation

bgamari
Copy link
Contributor

@bgamari bgamari commented Oct 14, 2018

Motivation for this change

This backports #48245 to 18.09, bringing it slightly closer to being cross-compilable.

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

volth added 2 commits October 14, 2018 02:03
@bgamari
Copy link
Contributor Author

bgamari commented Oct 14, 2018

I believe that this changes nothing in the non-cross case.

@Mic92
Copy link
Member

Mic92 commented Oct 14, 2018

@GrahamcOfBorg test boot-stage1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.boot-stage1

Partial log (click to expand)

machine: exit status 1
syncing
machine: running command: sync
machine: exit status 0
test script finished in 21.37s
cleaning up
killing machine (pid 597)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/7mdv4whs76k0r1zd24gq5737qc97vlvc-vm-test-run-boot-stage1

@Mic92 Mic92 merged commit 970b293 into NixOS:release-18.09 Oct 14, 2018
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: tests.boot-stage1

Partial log (click to expand)

machine: exit status 1
syncing
machine: running command: sync
machine: exit status 0
test script finished in 11.69s
cleaning up
killing machine (pid 631)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/chzzxj1hc35v9im3yh36lv046z191zgz-vm-test-run-boot-stage1

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
@bgamari @Mic92 @GrahamcOfBorg